From: Francis Dupont <fdupont@isc.org>
Date: Thu, 7 Jun 2018 14:51:51 +0000 (+0200)
Subject: [master] Finishing merge of trac5449 (Fixes from analyzers)
X-Git-Tag: trac5694_base~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dfd330a242e5dd677b26b497271ed7c13198330;p=thirdparty%2Fkea.git

[master] Finishing merge of trac5449 (Fixes from analyzers)
---

4dfd330a242e5dd677b26b497271ed7c13198330
diff --cc src/lib/cc/data.h
index d959a9684c,e8b225593f..2730a1a791
--- a/src/lib/cc/data.h
+++ b/src/lib/cc/data.h
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (C) 2010-2017 Internet Systems Consortium, Inc. ("ISC")
++// Copyright (C) 2010-2018 Internet Systems Consortium, Inc. ("ISC")
  //
  // This Source Code Form is subject to the terms of the Mozilla Public
  // License, v. 2.0. If a copy of the MPL was not distributed with this
@@@ -437,9 -437,9 +437,10 @@@ public
      /// @param file_name specified input file name (used in error reporting)
      /// @param preproc specified whether preprocessing (e.g. comment removal)
      ///                should be performed
+     /// @throw JSONError
      /// @return An ElementPtr that contains the element(s) specified
      /// in the given input stream.
 +    /// @throw JSONError
      static ElementPtr fromJSON(std::istream& in, const std::string& file_name,
                                 bool preproc = false);