outman/jsoncpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make project compileable with VS2013

Browse Source
This commit is contained in:
fabian 2024-04-23 12:13:57 +02:00
parent a15fc7ba88
commit 0d1ee21cb2
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/json/value.h
View File

@ -256,7 +256,15 @@ public:
// The constant is hard-coded because some compiler have trouble // The constant is hard-coded because some compiler have trouble
// converting Value::maxUInt64 to a double correctly (AIX/xlC). // converting Value::maxUInt64 to a double correctly (AIX/xlC).
// Assumes that UInt64 is a 64 bits integer. // Assumes that UInt64 is a 64 bits integer.
#if JSONCPP_CXX_STD_11
static JSONCPP_CONST double maxUInt64AsDouble = 18446744073709551615.0; static JSONCPP_CONST double maxUInt64AsDouble = 18446744073709551615.0;
#else
// In-class initializer for static data member of type 'const double' is a GNU
// extension. JSONCPP_CONST == const, if C++0x.
// So initialization has to be done in json_value.cpp to make this project
// compileable with e.g. VS2013
static JSONCPP_CONST double maxUInt64AsDouble;
#endif
// Workaround for bug in the NVIDIAs CUDA 9.1 nvcc compiler // Workaround for bug in the NVIDIAs CUDA 9.1 nvcc compiler
// when using gcc and clang backend compilers. CZString // when using gcc and clang backend compilers. CZString
// cannot be defined as private. See issue #486 // cannot be defined as private. See issue #486

10
src/lib_json/json_value.cpp
View File

@ -334,6 +334,16 @@ bool Value::CZString::isStaticString() const {
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////
#if JSONCPP_CXX_STD_11
#else
// In-class initializer for static data member of type 'const double' is a GNU
// extension. JSONCPP_CONST == const, if C++0x.
// So initialization has to be done in json_value.cpp to make this project
// compileable with e.g. VS2013.
JSONCPP_CONST double Value::maxUInt64AsDouble = 18446744073709551615.0;
#endif
/*! \internal Default constructor initialization must be equivalent to: /*! \internal Default constructor initialization must be equivalent to:
* memset( this, 0, sizeof(Value) ) * memset( this, 0, sizeof(Value) )
* This optimization is used in ValueInternalMap fast allocator. * This optimization is used in ValueInternalMap fast allocator.