From 231e2515aa1c34887513266903263dd367f9a14f Mon Sep 17 00:00:00 2001 From: Gaurav Date: Mon, 29 Feb 2016 11:34:22 +0530 Subject: [PATCH 1/4] Remove override keyword from dtors This is to silent issues reported in https://github.com/open-source-parsers/jsoncpp/issues/410 --- include/json/reader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/json/reader.h b/include/json/reader.h index 70d9505be..7d1fda79d 100644 --- a/include/json/reader.h +++ b/include/json/reader.h @@ -333,7 +333,7 @@ class JSON_API CharReaderBuilder : public CharReader::Factory { Json::Value settings_; CharReaderBuilder(); - ~CharReaderBuilder() override; + virtual ~CharReaderBuilder(); CharReader* newCharReader() const override; From f0cf3b031c4ac3ce519146dcde8137ae18ab2377 Mon Sep 17 00:00:00 2001 From: Gaurav Date: Mon, 29 Feb 2016 11:36:18 +0530 Subject: [PATCH 2/4] Remove override keyword from dtors --- include/json/writer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/json/writer.h b/include/json/writer.h index 49b15124d..d9043ed71 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -112,7 +112,7 @@ class JSON_API StreamWriterBuilder : public StreamWriter::Factory { Json::Value settings_; StreamWriterBuilder(); - ~StreamWriterBuilder() override; + virtual ~StreamWriterBuilder(); /** * \throw std::exception if something goes wrong (e.g. invalid settings) @@ -158,7 +158,7 @@ class JSON_API FastWriter : public Writer { public: FastWriter(); - ~FastWriter() override {} + virtual ~FastWriter() {} void enableYAMLCompatibility(); @@ -210,7 +210,7 @@ class JSON_API FastWriter : public Writer { class JSON_API StyledWriter : public Writer { public: StyledWriter(); - ~StyledWriter() override {} + virtaul ~StyledWriter() {} public: // overridden from Writer /** \brief Serialize a Value in JSON format. From 8f01b35ad62fe57fe595dc7264d83af4c131a85f Mon Sep 17 00:00:00 2001 From: Gaurav Date: Mon, 29 Feb 2016 11:37:23 +0530 Subject: [PATCH 3/4] Remove override keyword from dtors --- include/json/value.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/json/value.h b/include/json/value.h index b3f1ceb85..cda8a48c6 100644 --- a/include/json/value.h +++ b/include/json/value.h @@ -40,7 +40,7 @@ namespace Json { class JSON_API Exception : public std::exception { public: Exception(std::string const& msg); - ~Exception() throw() override; + virtual ~Exception() throw(); char const* what() const throw() override; protected: std::string msg_; From 5bf99d36ffeed442a9ef1fac8a104a03fdc18aaf Mon Sep 17 00:00:00 2001 From: Gaurav Date: Mon, 29 Feb 2016 11:41:22 +0530 Subject: [PATCH 4/4] Remove override keyword from dtors --- include/json/writer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/json/writer.h b/include/json/writer.h index d9043ed71..faf5e48bb 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -210,7 +210,7 @@ class JSON_API FastWriter : public Writer { class JSON_API StyledWriter : public Writer { public: StyledWriter(); - virtaul ~StyledWriter() {} + virtual ~StyledWriter() {} public: // overridden from Writer /** \brief Serialize a Value in JSON format.