diff options
| author | Francis Dupont <fdupont@isc.org> | 2018-06-07 16:51:51 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2018-06-07 16:51:51 +0200 |
| commit | 4dfd330a242e5dd677b26b497271ed7c13198330 (patch) | |
| tree | 2329ee6ce8d7c66c35d9d099ed8340c8cadc10a2 /src/lib/cc | |
| parent | [master] Added ChangeLog for #5622. (diff) | |
| parent | [5449] Removed explicit throws() in data.h (diff) | |
| download | kea-4dfd330a242e5dd677b26b497271ed7c13198330.tar.xz kea-4dfd330a242e5dd677b26b497271ed7c13198330.zip | |
[master] Finishing merge of trac5449 (Fixes from analyzers)
Diffstat (limited to 'src/lib/cc')
| -rw-r--r-- | src/lib/cc/data.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/cc/data.h b/src/lib/cc/data.h index d959a9684c..2730a1a791 100644 --- a/src/lib/cc/data.h +++ b/src/lib/cc/data.h @@ -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 @@ -425,9 +425,9 @@ public: /// @param in The string to parse the element from /// @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, bool preproc = false); /// Creates an Element from the given input stream containing JSON @@ -437,6 +437,7 @@ 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 @@ -452,6 +453,7 @@ public: /// track of the current line. /// @param pos A reference to the int where the function keeps /// track of the current position within the current line. + /// @throw JSONError /// @return An ElementPtr that contains the element(s) specified /// in the given input stream. // make this one private? |