Skip to content

Commit 614671d

Browse files
authored
Merge pull request open-source-parsers#669 from cdunn2001/avoid-redundant-depreciation-warnings
Ignoring the unrelated TravisCI build errors. Those are being addressed separately, in open-source-parsers#670.
2 parents 66d4573 + 132840a commit 614671d

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

include/json/writer.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,9 @@ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer {
156156
* \sa Reader, Value
157157
* \deprecated Use StreamWriterBuilder.
158158
*/
159+
#pragma warning(push)
160+
#pragma warning(disable:4996) // Deriving from deprecated class
159161
class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer {
160-
161162
public:
162163
FastWriter();
163164
~FastWriter() JSONCPP_OVERRIDE {}
@@ -184,6 +185,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
184185
bool dropNullPlaceholders_;
185186
bool omitEndingLineFeed_;
186187
};
188+
#pragma warning(pop)
187189

188190
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
189191
*human friendly way.
@@ -209,6 +211,8 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
209211
* \sa Reader, Value, Value::setComment()
210212
* \deprecated Use StreamWriterBuilder.
211213
*/
214+
#pragma warning(push)
215+
#pragma warning(disable:4996) // Deriving from deprecated class
212216
class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer {
213217
public:
214218
StyledWriter();
@@ -244,6 +248,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWrite
244248
unsigned int indentSize_;
245249
bool addChildValues_;
246250
};
251+
#pragma warning(pop)
247252

248253
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
249254
human friendly way,
@@ -270,6 +275,8 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWrite
270275
* \sa Reader, Value, Value::setComment()
271276
* \deprecated Use StreamWriterBuilder.
272277
*/
278+
#pragma warning(push)
279+
#pragma warning(disable:4996) // Deriving from deprecated class
273280
class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStreamWriter {
274281
public:
275282
/**
@@ -311,6 +318,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledStrea
311318
bool addChildValues_ : 1;
312319
bool indented_ : 1;
313320
};
321+
#pragma warning(pop)
314322

315323
#if defined(JSON_HAS_INT64)
316324
JSONCPP_STRING JSON_API valueToString(Int value);

0 commit comments

Comments
 (0)