mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2024-12-28 03:50:53 +08:00
json/config.h: Generalize setting of JSONCPP_OVERRIDE to all compilers
This commit has been adapted from InsightSoftwareConsortium/ITK@1c86090
This commit is contained in:
parent
980cdf0fb5
commit
ba6fa48d31
@ -77,12 +77,14 @@
|
|||||||
|
|
||||||
#endif // defined(_MSC_VER)
|
#endif // defined(_MSC_VER)
|
||||||
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER <= 1600 // MSVC <= 2010
|
// In c++11 the override keyword allows you to explicity define that a function
|
||||||
# define JSONCPP_OVERRIDE
|
// is intended to override the base-class version. This makes the code more
|
||||||
#else
|
// managable and fixes a set of common hard-to-find bugs.
|
||||||
|
#if __cplusplus >= 201103L
|
||||||
# define JSONCPP_OVERRIDE override
|
# define JSONCPP_OVERRIDE override
|
||||||
#endif // MSVC <= 2010
|
#else
|
||||||
|
# define JSONCPP_OVERRIDE
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef JSON_HAS_RVALUE_REFERENCES
|
#ifndef JSON_HAS_RVALUE_REFERENCES
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user