generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-02-25 23:47:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #449 from cdunn2001/override-keyword

Browse Source 
Use macro for `override`
This commit is contained in:
Christopher Dunn 2016-03-21 21:16:00 -05:00
commit b803b92d11
7 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/json/config.h
View File

@ -77,6 +77,12 @@
#endif // defined(_MSC_VER) #endif // defined(_MSC_VER)
#if defined(_MSC_VER) && _MSC_VER <= 1600 // MSVC <= 2010
# define JSONCPP_OVERRIDE
#else
# define JSONCPP_OVERRIDE override
#endif // MSVC <= 2010
#ifndef JSON_HAS_RVALUE_REFERENCES #ifndef JSON_HAS_RVALUE_REFERENCES

4
include/json/reader.h
View File

@ -333,9 +333,9 @@ public:
Json::Value settings_; Json::Value settings_;
CharReaderBuilder(); CharReaderBuilder();
~CharReaderBuilder() override; ~CharReaderBuilder() JSONCPP_OVERRIDE;
CharReader* newCharReader() const override; CharReader* newCharReader() const JSONCPP_OVERRIDE;
/** \return true if 'settings' are legal and consistent; /** \return true if 'settings' are legal and consistent;
* otherwise, indicate bad settings via 'invalid'. * otherwise, indicate bad settings via 'invalid'.

4
include/json/value.h
View File

@ -53,8 +53,8 @@ namespace Json {
class JSON_API Exception : public std::exception { class JSON_API Exception : public std::exception {
public: public:
Exception(JSONCPP_STRING const& msg); Exception(JSONCPP_STRING const& msg);
~Exception() throw() override; ~Exception() throw() JSONCPP_OVERRIDE;
char const* what() const throw() override; char const* what() const throw() JSONCPP_OVERRIDE;
protected: protected:
JSONCPP_STRING msg_; JSONCPP_STRING msg_;
}; };

12
include/json/writer.h
View File

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

2
src/lib_json/json_reader.cpp
View File

@ -1907,7 +1907,7 @@ public:
{} {}
bool parse( bool parse(
char const* beginDoc, char const* endDoc, char const* beginDoc, char const* endDoc,
Value* root, JSONCPP_STRING* errs) override { Value* root, JSONCPP_STRING* errs) JSONCPP_OVERRIDE {
bool ok = reader_.parse(beginDoc, endDoc, *root, collectComments_); bool ok = reader_.parse(beginDoc, endDoc, *root, collectComments_);
if (errs) { if (errs) {
*errs = reader_.getFormattedErrorMessages(); *errs = reader_.getFormattedErrorMessages();

2
src/lib_json/json_writer.cpp
View File

@ -839,7 +839,7 @@ struct BuiltStyledStreamWriter : public StreamWriter
JSONCPP_STRING const& endingLineFeedSymbol, JSONCPP_STRING const& endingLineFeedSymbol,
bool useSpecialFloats, bool useSpecialFloats,
unsigned int precision); unsigned int precision);
int write(Value const& root, JSONCPP_OSTREAM* sout) override; int write(Value const& root, JSONCPP_OSTREAM* sout) JSONCPP_OVERRIDE;
private: private:
void writeValue(Value const& value); void writeValue(Value const& value);
void writeArrayValue(Value const& value); void writeArrayValue(Value const& value);

4
src/test_lib_json/jsontest.h
View File

@ -271,8 +271,8 @@ TestResult& checkStringEqual(TestResult& result,
} \ } \
\ \
public: /* overidden from TestCase */ \ public: /* overidden from TestCase */ \
const char* testName() const override { return #FixtureType "/" #name; } \ const char* testName() const JSONCPP_OVERRIDE { return #FixtureType "/" #name; } \
void runTestCase() override; \ void runTestCase() JSONCPP_OVERRIDE; \
}; \ }; \
\ \
void Test##FixtureType##name::runTestCase() void Test##FixtureType##name::runTestCase()