More VS warning prevention

cdunn2001 · cdunn2001 · commit 132840aaa144 · 2017-09-11T13:44:07.000-05:00
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
diff --git 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 <a HREF="http://www.json.org">JSON</a> 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 <a HREF="http://www.json.org">JSON</a> 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);
