Place two warning disables in their proper place.

Fixup comments

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Author: neheb

include/json/reader.h

@@ -6,6 +6,11 @@
 #ifndef JSON_READER_H_INCLUDED
 #define JSON_READER_H_INCLUDED
 
+#if defined(_MSC_VER)
+// Disable warning about deprecated destructors
+#pragma warning(disable : 4996)
+#endif
+
 #if !defined(JSON_IS_AMALGAMATION)
 #include "json_features.h"
 #include "value.h"

include/json/value.h

@@ -48,9 +48,12 @@
 
 // Disable warning C4251: <data member>: <type> needs to have dll-interface to
 // be used by...
+// Disable warning C4275: non - DLL-interface class 'class_1' used as base for
+// DLL-interface class 'class_2'
 #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 #pragma warning(push)
 #pragma warning(disable : 4251)
+#pragma warning(disable : 4275)
 #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 
 #pragma pack(push, 8)

include/json/writer.h

@@ -6,6 +6,11 @@
 #ifndef JSON_WRITER_H_INCLUDED
 #define JSON_WRITER_H_INCLUDED
 
+#if defined(_MSC_VER)
+// Disable warning about deprecated destructors
+#pragma warning(disable : 4996)
+#endif
+
 #if !defined(JSON_IS_AMALGAMATION)
 #include "value.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
@@ -18,6 +23,7 @@
 #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) && defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable : 4251)
+#pragma warning(disable : 4275)
 #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 
 #pragma pack(push, 8)

src/lib_json/json_reader.cpp

@@ -8,9 +8,6 @@
 #if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
 #endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
-
-// Disable warning about strdup being deprecated.
-#pragma warning(disable : 4996)
 #endif //_MSC_VER
 
 #if !defined(JSON_IS_AMALGAMATION)

src/lib_json/json_writer.cpp

@@ -19,11 +19,6 @@
 #include <sstream>
 #include <utility>
 
-#if defined(_MSC_VER)
-// Disable warning about strdup being deprecated.
-#pragma warning(disable : 4996)
-#endif
-
 namespace Json {
 
 using StreamWriterPtr = std::unique_ptr<StreamWriter>;