From 9bb984a59444c26a3509b8de9c5c5d4dec7985b3 Mon Sep 17 00:00:00 2001 From: Motti Lanzkron Date: Mon, 11 Sep 2017 16:14:52 +0300 Subject: [PATCH 1/2] Update writer.h fix typos --- include/json/writer.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/json/writer.h b/include/json/writer.h index f258cbfdc..87365ef2d 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -156,8 +156,10 @@ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer { * \sa Reader, Value * \deprecated Use StreamWriterBuilder. */ +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { - +#pragma warning(pop) public: FastWriter(); ~FastWriter() JSONCPP_OVERRIDE {} @@ -209,7 +211,10 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter * \sa Reader, Value, Value::setComment() * \deprecated Use StreamWriterBuilder. */ +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { +#pragma warning(pop) public: StyledWriter(); ~StyledWriter() JSONCPP_OVERRIDE {} From 132840aaa14421f1424fb174ebf8fd2d5991fe1f Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Mon, 11 Sep 2017 13:39:38 -0500 Subject: [PATCH 2/2] More VS warning prevention See comment by jpo38 in SO: * https://stackoverflow.com/questions/46151531/how-works-deprecated-warnings-and-how-to-remove-them-when-using-jsoncpp/46156833#46156833 --- include/json/writer.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/json/writer.h b/include/json/writer.h index 87365ef2d..ca5797085 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -159,7 +159,6 @@ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer { #pragma warning(push) #pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { -#pragma warning(pop) public: FastWriter(); ~FastWriter() JSONCPP_OVERRIDE {} @@ -186,6 +185,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter bool dropNullPlaceholders_; bool omitEndingLineFeed_; }; +#pragma warning(pop) /** \brief Writes a Value in JSON format in a *human friendly way. @@ -214,7 +214,6 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter #pragma warning(push) #pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { -#pragma warning(pop) public: StyledWriter(); ~StyledWriter() JSONCPP_OVERRIDE {} @@ -249,6 +248,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWrite unsigned int indentSize_; bool addChildValues_; }; +#pragma warning(pop) /** \brief Writes a Value in JSON format in a human friendly way, @@ -275,6 +275,8 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWrite * \sa Reader, Value, Value::setComment() * \deprecated Use StreamWriterBuilder. */ +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter { public: /** @@ -316,6 +318,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStrea bool addChildValues_ : 1; bool indented_ : 1; }; +#pragma warning(pop) #if defined(JSON_HAS_INT64) JSONCPP_STRING JSON_API valueToString(Int value);