diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-20 14:31:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-20 14:31:59 (GMT) |
| commit | 17cfa09eb2a78349a6471e4719bc933dd0625d9e (patch) | |
| tree | 4faaecb02a32e4b42cb7dd70b6a7d63b78917b9d /Utilities/cmjsoncpp | |
| parent | 1ef4e3ab4534d0b24031045a476ff223574c38ec (diff) | |
| parent | 0238d0c397e52a82f20a0b7bf5aad9a07f36133c (diff) | |
| download | CMake-17cfa09eb2a78349a6471e4719bc933dd0625d9e.zip CMake-17cfa09eb2a78349a6471e4719bc933dd0625d9e.tar.gz CMake-17cfa09eb2a78349a6471e4719bc933dd0625d9e.tar.bz2 | |
Merge topic 'cmake-labels-json'
0238d0c3 cmake: Generate an internal 'Labels.json' file next to 'Labels.txt'
bda4f0b6 jsoncpp: Add headers to help CMake include in-source jsoncpp headers
a02fbec5 jsoncpp: Drop doxygen comments that cause Clang warnings
Diffstat (limited to 'Utilities/cmjsoncpp')
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/reader.h | 2 | ||||
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/writer.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/Utilities/cmjsoncpp/include/json/reader.h b/Utilities/cmjsoncpp/include/json/reader.h index 98814d5..95237d1 100644 --- a/Utilities/cmjsoncpp/include/json/reader.h +++ b/Utilities/cmjsoncpp/include/json/reader.h @@ -106,9 +106,7 @@ public: * the parsed document. An empty string is returned if no error * occurred * during parsing. - * \deprecated Use getFormattedErrorMessages() instead (typo fix). */ - JSONCPP_DEPRECATED("Use getFormattedErrorMessages instead") std::string getFormatedErrorMessages() const; /** \brief Returns a user friendly string that list errors in the parsed diff --git a/Utilities/cmjsoncpp/include/json/writer.h b/Utilities/cmjsoncpp/include/json/writer.h index 397bf6a..10863b0 100644 --- a/Utilities/cmjsoncpp/include/json/writer.h +++ b/Utilities/cmjsoncpp/include/json/writer.h @@ -150,7 +150,6 @@ private: * If the Value have comments then they are outputed according to their #CommentPlacement. * - * \param indentation Each level will be indented by this amount extra. * \sa Reader, Value, Value::setComment() */ class JSON_API StyledStreamWriter { |