make project compileable with VS2013
This commit is contained in:
parent
a15fc7ba88
commit
0d1ee21cb2
@ -256,7 +256,15 @@ public:
|
||||
// The constant is hard-coded because some compiler have trouble
|
||||
// converting Value::maxUInt64 to a double correctly (AIX/xlC).
|
||||
// Assumes that UInt64 is a 64 bits integer.
|
||||
#if JSONCPP_CXX_STD_11
|
||||
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
|
||||
// when using gcc and clang backend compilers. CZString
|
||||
// cannot be defined as private. See issue #486
|
||||
|
@ -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:
|
||||
* memset( this, 0, sizeof(Value) )
|
||||
* This optimization is used in ValueInternalMap fast allocator.
|
||||
|
Loading…
Reference in New Issue
Block a user