Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: third_party/jsoncpp/overrides/include/json/value.h

Issue 1060383002: Make one-bit bit fields unsigned. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating README.chromium and putting all changes in patch file. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/jsoncpp/README.chromium ('k') | third_party/jsoncpp/patches/value.h.diff » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..57072602034e81b674e357cefddca45ed578473b 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 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_;
};
« no previous file with comments | « third_party/jsoncpp/README.chromium ('k') | third_party/jsoncpp/patches/value.h.diff » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698