739351d476
Change log:95336cb92b..191d55580eFull diff:95336cb92b..191d55580eRoll chromium third_party 4e16929f46..3a8f2a9e1e Change log:4e16929f46..3a8f2a9e1eChanged dependencies: * src/tools:c44a3f5eca..f524a53b81DEPS diff:95336cb92b..191d55580e/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e Reviewed-on: https://webrtc-review.googlesource.com/76120 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23205}
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
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 <string>
|
|
# include <vector>
|
|
@@ -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_;
|
|
};
|