From 11396444b7bcdc5256f9a227f12cbb71c0371b9a Mon Sep 17 00:00:00 2001 From: Motti Lanzkron Date: Mon, 11 Sep 2017 16:14:52 +0300 Subject: [PATCH 1/2] Update writer.h --- include/json/writer.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/json/writer.h b/include/json/writer.h index f258cbfdc..3d3a42422 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -156,8 +156,10 @@ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer { * \sa Reader, Value * \deprecated Use StreamWriterBuilder. */ +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from depricated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { - +#pragma warning(pop) public: FastWriter(); ~FastWriter() JSONCPP_OVERRIDE {} @@ -209,7 +211,10 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter * \sa Reader, Value, Value::setComment() * \deprecated Use StreamWriterBuilder. */ +#pragma warning(push) +#pragma warning(disable:4996) // Deriving from depricated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { +#pragma warning(pop) public: StyledWriter(); ~StyledWriter() JSONCPP_OVERRIDE {} From 847e6076d6f965edbefdc2861a7db7666f762fe1 Mon Sep 17 00:00:00 2001 From: Motti Lanzkron Date: Mon, 11 Sep 2017 16:25:40 +0300 Subject: [PATCH 2/2] fix typos --- include/json/writer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/json/writer.h b/include/json/writer.h index 3d3a42422..06ab33549 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -157,7 +157,7 @@ class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer { * \deprecated Use StreamWriterBuilder. */ #pragma warning(push) -#pragma warning(disable:4996) // Deriving from depricated class +#pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter : public Writer { #pragma warning(pop) public: @@ -212,7 +212,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter * \deprecated Use StreamWriterBuilder. */ #pragma warning(push) -#pragma warning(disable:4996) // Deriving from depricated class +#pragma warning(disable:4996) // Deriving from deprecated class class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API StyledWriter : public Writer { #pragma warning(pop) public: