Chromium Code Reviews| Index: third_party/jsoncpp/overrides/include/json/value.h |
| diff --git a/third_party/jsoncpp/overrides/include/json/value.h b/third_party/jsoncpp/overrides/include/json/value.h |
| index 1484ee2c4947e00b81108ad4b2b86686a76efdc9..c3ae7df129142f708cf1584f30892a19b86eb9df 100644 |
| --- a/third_party/jsoncpp/overrides/include/json/value.h |
| +++ b/third_party/jsoncpp/overrides/include/json/value.h |
| @@ -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 allocated_ : 1; |
|
scottmg
2015/04/13 22:45:51
can you make these `unsigned int` to match the oth
|
| # ifdef JSON_VALUE_USE_INTERNAL_MAP |
| unsigned int itemIsUsed_ : 1; // used by the ValueInternalMap container. |
| - int memberNameIsStatic_ : 1; // used by the ValueInternalMap container. |
| + unsigned memberNameIsStatic_ : 1; // used by the ValueInternalMap container. |
| # endif |
| CommentInfo *comments_; |
| }; |