diff --git "a/source\\include\\json\\value.h" "b/overrides\\include\\json\\value.h" index b013c9b..5707260 100644 --- "a/source\\include\\json\\value.h" +++ "b/overrides\\include\\json\\value.h" @@ -7,7 +7,7 @@ # define CPPTL_JSON_H_INCLUDED #if !defined(JSON_IS_AMALGAMATION) -# include "forwards.h" +# include "third_party/jsoncpp/source/include/json/forwards.h" #endif // if !defined(JSON_IS_AMALGAMATION) # include # include @@ -136,7 +136,7 @@ namespace Json { typedef Json::LargestUInt LargestUInt; typedef Json::ArrayIndex ArrayIndex; - static const Value null; + static const Value& null; /// Minimum signed integer value that can be stored in a Json::Value. static const LargestInt minLargestInt; /// Maximum signed integer value that can be stored in a Json::Value. @@ -496,10 +496,12 @@ namespace Json { # endif } value_; ValueType type_ : 8; - int allocated_ : 1; // Notes: if declared as bool, bitfield is useless. + // One-bit bitfields must be unsigned to allow storing 1. + // They must be 32-bits to share storage with ValueHolder. + unsigned int allocated_ : 1; # ifdef JSON_VALUE_USE_INTERNAL_MAP unsigned int itemIsUsed_ : 1; // used by the ValueInternalMap container. - int memberNameIsStatic_ : 1; // used by the ValueInternalMap container. + unsigned int memberNameIsStatic_ : 1; // used by the ValueInternalMap container. # endif CommentInfo *comments_; };