generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-06 02:45:02 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #669 from cdunn2001/avoid-redundant-depreciation-warnings

Browse Source 
Ignoring the unrelated TravisCI build errors. Those are being addressed separately, in #670.
This commit is contained in:
Christopher Dunn 2017-09-11 14:00:59 -05:00 committed by GitHub
commit 614671d09b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/json/writer.h
View File

@ -156,8 +156,9 @@ public:
* \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 {
public:
FastWriter();
~FastWriter() JSONCPP_OVERRIDE {}
@ -184,6 +185,7 @@ private:
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.
@ -209,6 +211,8 @@ private:
* \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 {
public:
StyledWriter();
@ -244,6 +248,7 @@ private:
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,
@ -270,6 +275,8 @@ private:
* \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:
/**
@ -311,6 +318,7 @@ private:
bool addChildValues_ : 1;
bool indented_ : 1;
};
#pragma warning(pop)
#if defined(JSON_HAS_INT64)
JSONCPP_STRING JSON_API valueToString(Int value);