generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-06 02:45:02 +02:00
Code Issues Projects Releases Wiki Activity

Issue #731: Provide new JSONCPP_OP_EXPLICIT macro to restore VS 2012 support after recent introduction of explicit conversion function in JSON::Value.

Browse Source
This commit is contained in:
drgler 2018-01-13 15:28:19 +01:00 committed by Christopher Dunn
parent edb4bdb7ec
commit 04abe38148
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/json/config.h
View File

@ -84,15 +84,23 @@
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# define JSONCPP_OVERRIDE override # define JSONCPP_OVERRIDE override
# define JSONCPP_NOEXCEPT noexcept # define JSONCPP_NOEXCEPT noexcept
# define JSONCPP_OP_EXPLICIT explicit
#elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900 #elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900
# define JSONCPP_OVERRIDE override # define JSONCPP_OVERRIDE override
# define JSONCPP_NOEXCEPT throw() # define JSONCPP_NOEXCEPT throw()
# if _MSC_VER >= 1800 // MSVC 2013
# define JSONCPP_OP_EXPLICIT explicit
# else
# define JSONCPP_OP_EXPLICIT
# endif
#elif defined(_MSC_VER) && _MSC_VER >= 1900 #elif defined(_MSC_VER) && _MSC_VER >= 1900
# define JSONCPP_OVERRIDE override # define JSONCPP_OVERRIDE override
# define JSONCPP_NOEXCEPT noexcept # define JSONCPP_NOEXCEPT noexcept
# define JSONCPP_OP_EXPLICIT explicit
#else #else
# define JSONCPP_OVERRIDE # define JSONCPP_OVERRIDE
# define JSONCPP_NOEXCEPT throw() # define JSONCPP_NOEXCEPT throw()
# define JSONCPP_OP_EXPLICIT
#endif #endif
#ifndef JSON_HAS_RVALUE_REFERENCES #ifndef JSON_HAS_RVALUE_REFERENCES

2
include/json/value.h
View File

@ -408,7 +408,7 @@ Json::Value obj_value(Json::objectValue); // {}
bool empty() const; bool empty() const;
/// Return !isNull() /// Return !isNull()
explicit operator bool() const; JSONCPP_OP_EXPLICIT operator bool() const;
/// Remove all object members and array elements. /// Remove all object members and array elements.
/// \pre type() is arrayValue, objectValue, or nullValue /// \pre type() is arrayValue, objectValue, or nullValue