mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2025-04-22 08:34:33 +02:00
Merge pull request #491 from mwiesenberger/0.y.z
workaround for cuda 7.5 nvcc compiler
This commit is contained in:
commit
3eda8a63ca
@ -216,7 +216,12 @@ public:
|
|||||||
static const UInt64 maxUInt64;
|
static const UInt64 maxUInt64;
|
||||||
#endif // defined(JSON_HAS_INT64)
|
#endif // defined(JSON_HAS_INT64)
|
||||||
|
|
||||||
|
//MW: workaround for bug in NVIDIAs CUDA 7.5 nvcc compiler
|
||||||
|
#ifdef __NVCC__
|
||||||
|
public:
|
||||||
|
#else
|
||||||
private:
|
private:
|
||||||
|
#endif //__NVCC__
|
||||||
#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
|
#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
|
||||||
class CZString {
|
class CZString {
|
||||||
public:
|
public:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user