generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-18 11:35:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #679 from hughbe/clang-warnings

Browse Source 
Fix unknown pragma warnings with clang
This commit is contained in:
Christopher Dunn 2017-09-17 02:56:21 -05:00 committed by GitHub
commit 4d587638af
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/json/writer.h
View File

@ -15,7 +15,7 @@
// Disable warning C4251: <data member>: <type> needs to have dll-interface to // Disable warning C4251: <data member>: <type> needs to have dll-interface to
// be used by... // 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(push)
#pragma warning(disable : 4251) #pragma warning(disable : 4251)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
@ -156,8 +156,10 @@ public:
* \sa Reader, Value * \sa Reader, Value
* \deprecated Use StreamWriterBuilder. * \deprecated Use StreamWriterBuilder.
*/ */
#if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4996) // Deriving from deprecated class #pragma warning(disable:4996) // Deriving from deprecated class
#endif
class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer {
public: public:
FastWriter(); FastWriter();
@ -185,7 +187,9 @@ private:
bool dropNullPlaceholders_; bool dropNullPlaceholders_;
bool omitEndingLineFeed_; bool omitEndingLineFeed_;
}; };
#if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
*human friendly way. *human friendly way.
@ -211,8 +215,10 @@ private:
* \sa Reader, Value, Value::setComment() * \sa Reader, Value, Value::setComment()
* \deprecated Use StreamWriterBuilder. * \deprecated Use StreamWriterBuilder.
*/ */
#if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4996) // Deriving from deprecated class #pragma warning(disable:4996) // Deriving from deprecated class
#endif
class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer {
public: public:
StyledWriter(); StyledWriter();
@ -248,7 +254,9 @@ private:
unsigned int indentSize_; unsigned int indentSize_;
bool addChildValues_; bool addChildValues_;
}; };
#if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
human friendly way, human friendly way,
@ -275,8 +283,10 @@ private:
* \sa Reader, Value, Value::setComment() * \sa Reader, Value, Value::setComment()
* \deprecated Use StreamWriterBuilder. * \deprecated Use StreamWriterBuilder.
*/ */
#if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4996) // Deriving from deprecated class #pragma warning(disable:4996) // Deriving from deprecated class
#endif
class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter { class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter {
public: public:
/** /**
@ -318,7 +328,9 @@ private:
bool addChildValues_ : 1; bool addChildValues_ : 1;
bool indented_ : 1; bool indented_ : 1;
}; };
#if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif
#if defined(JSON_HAS_INT64) #if defined(JSON_HAS_INT64)
JSONCPP_STRING JSON_API valueToString(Int value); JSONCPP_STRING JSON_API valueToString(Int value);