Merge pull request open-source-parsers#679 from hughbe/clang-warnings

Fix unknown pragma warnings with clang
MarcelRaad · Sep 17, 2017 · 4d58763 · 4d58763
2 parents 75e0c39 + 7287065
commit 4d58763
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/include/json/writer.h b/include/json/writer.h
@@ -15,7 +15,7 @@
 
 // Disable warning C4251: <data member>: <type> needs to have dll-interface to
 // be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) && defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable : 4251)
 #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
@@ -156,8 +156,10 @@ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer {
  * \sa Reader, Value
  * \deprecated Use StreamWriterBuilder.
  */
+#if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4996) // Deriving from deprecated class
+#endif
 class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer {
 public:
  FastWriter();
@@ -185,7 +187,9 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
  bool dropNullPlaceholders_;
  bool omitEndingLineFeed_;
 };
+#if defined(_MSC_VER)
 #pragma warning(pop)
+#endif
 
 /** \brief Writes a Value in <a HREF="http:https://www.json.org">JSON</a> format in a
  *human friendly way.
@@ -211,8 +215,10 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
  * \sa Reader, Value, Value::setComment()
  * \deprecated Use StreamWriterBuilder.
  */
+#if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4996) // Deriving from deprecated class
+#endif
 class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer {
 public:
  StyledWriter();
@@ -248,7 +254,9 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWrite
  unsigned int indentSize_;
  bool addChildValues_;
 };
+#if defined(_MSC_VER)
 #pragma warning(pop)
+#endif
 
 /** \brief Writes a Value in <a HREF="http:https://www.json.org">JSON</a> format in a
  human friendly way,
@@ -275,8 +283,10 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWrite
  * \sa Reader, Value, Value::setComment()
  * \deprecated Use StreamWriterBuilder.
  */
+#if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4996) // Deriving from deprecated class
+#endif
 class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter {
 public:
 /**
@@ -318,7 +328,9 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStrea
  bool addChildValues_ : 1;
  bool indented_ : 1;
 };
+#if defined(_MSC_VER)
 #pragma warning(pop)
+#endif
 
 #if defined(JSON_HAS_INT64)
 JSONCPP_STRING JSON_API valueToString(Int value);