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

Unified Diff: third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 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/protobuf/objectivec/GPBUtilities.m ('k') | third_party/protobuf/objectivec/README.md » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h
diff --git a/third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h b/third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h
index cac551f6f66f6cf685ae8be8133fb95eabc9b67b..a6b6c84d988064c5e8f1d90ab7240a75c1df63df 100644
--- a/third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h
+++ b/third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h
@@ -185,7 +185,7 @@ GPB_INLINE void GPBSetHasIvarField(GPBMessage *self, GPBFieldDescriptor *field,
}
void GPBMaybeClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof,
- uint32_t fieldNumberNotToClear);
+ int32_t oneofHasIndex, uint32_t fieldNumberNotToClear);
//%PDDM-DEFINE GPB_IVAR_SET_DECL(NAME, TYPE)
//%void GPBSet##NAME##IvarWithFieldInternal(GPBMessage *self,
« no previous file with comments | « third_party/protobuf/objectivec/GPBUtilities.m ('k') | third_party/protobuf/objectivec/README.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698