diff options
-rw-r--r-- | Utilities/cmjsoncpp/include/json/config.h | 1 | ||||
-rw-r--r-- | Utilities/cmjsoncpp/include/json/reader.h | 4 | ||||
-rw-r--r-- | Utilities/cmjsoncpp/include/json/value.h | 10 | ||||
-rw-r--r-- | Utilities/cmjsoncpp/include/json/writer.h | 8 |
4 files changed, 12 insertions, 11 deletions
diff --git a/Utilities/cmjsoncpp/include/json/config.h b/Utilities/cmjsoncpp/include/json/config.h index a15ab40..eb52e71 100644 --- a/Utilities/cmjsoncpp/include/json/config.h +++ b/Utilities/cmjsoncpp/include/json/config.h @@ -138,6 +138,7 @@ # endif // GNUC version #endif // __clang__ || __GNUC__ +#undef JSONCPP_DEPRECATED // no deprecations in CMake copy #if !defined(JSONCPP_DEPRECATED) #define JSONCPP_DEPRECATED(message) #endif // if !defined(JSONCPP_DEPRECATED) diff --git a/Utilities/cmjsoncpp/include/json/reader.h b/Utilities/cmjsoncpp/include/json/reader.h index 82859fd..f690f23 100644 --- a/Utilities/cmjsoncpp/include/json/reader.h +++ b/Utilities/cmjsoncpp/include/json/reader.h @@ -30,7 +30,7 @@ namespace Json { /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a *Value. * - * \deprecated Use CharReader and CharReaderBuilder. + * deprecated Use CharReader and CharReaderBuilder. */ class JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead") JSON_API Reader { public: @@ -110,7 +110,7 @@ public: * the parsed document. An empty string is returned if no error * occurred * during parsing. - * \deprecated Use getFormattedErrorMessages() instead (typo fix). + * deprecated Use getFormattedErrorMessages() instead (typo fix). */ JSONCPP_DEPRECATED("Use getFormattedErrorMessages() instead.") JSONCPP_STRING getFormatedErrorMessages() const; diff --git a/Utilities/cmjsoncpp/include/json/value.h b/Utilities/cmjsoncpp/include/json/value.h index ebca175..2ee227b 100644 --- a/Utilities/cmjsoncpp/include/json/value.h +++ b/Utilities/cmjsoncpp/include/json/value.h @@ -242,7 +242,7 @@ private: bool operator<(CZString const& other) const; bool operator==(CZString const& other) const; ArrayIndex index() const; - //const char* c_str() const; ///< \deprecated + //const char* c_str() const; ///< deprecated char const* data() const; unsigned length() const; bool isStaticString() const; @@ -517,12 +517,12 @@ Json::Value obj_value(Json::objectValue); // {} /// \return the removed Value, or null. /// \pre type() is objectValue or nullValue /// \post type() is unchanged - /// \deprecated + /// deprecated JSONCPP_DEPRECATED("") Value removeMember(const char* key); /// Same as removeMember(const char*) /// \param key may contain embedded nulls. - /// \deprecated + /// deprecated JSONCPP_DEPRECATED("") Value removeMember(const JSONCPP_STRING& key); /// Same as removeMember(const char* begin, const char* end, Value* removed), @@ -570,7 +570,7 @@ Json::Value obj_value(Json::objectValue); // {} // EnumValues enumValues() const; //# endif - /// \deprecated Always pass len. + /// deprecated Always pass len. JSONCPP_DEPRECATED("Use setComment(JSONCPP_STRING const&) instead.") void setComment(const char* comment, CommentPlacement placement); /// Comments must be //... or /* ... */ @@ -734,7 +734,7 @@ public: /// Return the member name of the referenced Value. "" if it is not an /// objectValue. - /// \deprecated This cannot be used for UTF-8 strings, since there can be embedded nulls. + /// deprecated This cannot be used for UTF-8 strings, since there can be embedded nulls. JSONCPP_DEPRECATED("Use `key = name();` instead.") char const* memberName() const; /// Return the member name of the referenced Value, or NULL if it is not an diff --git a/Utilities/cmjsoncpp/include/json/writer.h b/Utilities/cmjsoncpp/include/json/writer.h index ee83ae0..c98bf60 100644 --- a/Utilities/cmjsoncpp/include/json/writer.h +++ b/Utilities/cmjsoncpp/include/json/writer.h @@ -139,7 +139,7 @@ public: }; /** \brief Abstract class for writers. - * \deprecated Use StreamWriter. (And really, this is an implementation detail.) + * deprecated Use StreamWriter. (And really, this is an implementation detail.) */ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer { public: @@ -155,7 +155,7 @@ public: *consumption, * but may be usefull to support feature such as RPC where bandwith is limited. * \sa Reader, Value - * \deprecated Use StreamWriterBuilder. + * deprecated Use StreamWriterBuilder. */ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { @@ -208,7 +208,7 @@ private: *#CommentPlacement. * * \sa Reader, Value, Value::setComment() - * \deprecated Use StreamWriterBuilder. + * deprecated Use StreamWriterBuilder. */ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { public: @@ -269,7 +269,7 @@ private: #CommentPlacement. * * \sa Reader, Value, Value::setComment() - * \deprecated Use StreamWriterBuilder. + * deprecated Use StreamWriterBuilder. */ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter { public: |