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

Use macro for override

Browse Source 
b/c MS VS2010 is supposed to be C++11 but does not fulfull
the entire standard.

Resolves #410.
Re: #430.
This commit is contained in:
Christopher Dunn
2016-03-21 21:00:24 -05:00
parent 1c47796479
commit 98e981dff9
7 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/json/writer.h
View File

@@ -112,12 +112,12 @@ public:
Json::Value settings_;
StreamWriterBuilder();
~StreamWriterBuilder() override;
~StreamWriterBuilder() JSONCPP_OVERRIDE;
/**
* \throw std::exception if something goes wrong (e.g. invalid settings)
*/
StreamWriter* newStreamWriter() const override;
StreamWriter* newStreamWriter() const JSONCPP_OVERRIDE;
/** \return true if 'settings' are legal and consistent;
* otherwise, indicate bad settings via 'invalid'.
@@ -158,7 +158,7 @@ class JSON_API FastWriter : public Writer {
public:
FastWriter();
~FastWriter() override {}
~FastWriter() JSONCPP_OVERRIDE {}
void enableYAMLCompatibility();
@@ -172,7 +172,7 @@ public:
void omitEndingLineFeed();
public: // overridden from Writer
JSONCPP_STRING write(const Value& root) override;
JSONCPP_STRING write(const Value& root) JSONCPP_OVERRIDE;
private:
void writeValue(const Value& value);
@@ -210,14 +210,14 @@ private:
class JSON_API StyledWriter : public Writer {
public:
StyledWriter();
~StyledWriter() override {}
~StyledWriter() JSONCPP_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) override;
JSONCPP_STRING write(const Value& root) JSONCPP_OVERRIDE;
private:
void writeValue(const Value& value);