generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-27 02:53:09 +01:00
Code Issues Projects Releases Wiki Activity

COMP: Use C++11 override directly

Browse Source 
The override support in C++11 is required so avoid aliasing
this feature.  Compilers that do not support the override keyword
are no longer supported.
This commit is contained in:
Hans Johnson
2019-01-11 13:58:53 -06:00
committed by Hans Johnson
parent 8b31c6f0fd
commit 2853b1cdac
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/json/writer.h
View File

@@ -119,12 +119,12 @@ public:
Json::Value settings_;
StreamWriterBuilder();
~StreamWriterBuilder() JSONCPP_OVERRIDE;
~StreamWriterBuilder() override;
/**
* \throw std::exception if something goes wrong (e.g. invalid settings)
*/
StreamWriter* newStreamWriter() const JSONCPP_OVERRIDE;
StreamWriter* newStreamWriter() const override;
/** \return true if 'settings' are legal and consistent;
* otherwise, indicate bad settings via 'invalid'.
@@ -169,7 +169,7 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
: public Writer {
public:
FastWriter();
~FastWriter() JSONCPP_OVERRIDE {}
~FastWriter() override {}
void enableYAMLCompatibility();
@@ -183,7 +183,7 @@ public:
void omitEndingLineFeed();
public: // overridden from Writer
JSONCPP_STRING write(const Value& root) JSONCPP_OVERRIDE;
JSONCPP_STRING write(const Value& root) override;
private:
void writeValue(const Value& value);
@@ -229,14 +229,14 @@ class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API
StyledWriter : public Writer {
public:
StyledWriter();
~StyledWriter() JSONCPP_OVERRIDE {}
~StyledWriter() override {}
public: // overridden from Writer
/** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
* \param root Value to serialize.
* \return String containing the JSON document that represents the root value.
*/
JSONCPP_STRING write(const Value& root) JSONCPP_OVERRIDE;
JSONCPP_STRING write(const Value& root) override;
private:
void writeValue(const Value& value);