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

Unified Diff: third_party/protobuf/src/google/protobuf/extension_set.h

Issue 2885223002: Protobuf: Remove protobuf globals patch (Closed)
Patch Set: typo Created 3 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
Index: third_party/protobuf/src/google/protobuf/extension_set.h
diff --git a/third_party/protobuf/src/google/protobuf/extension_set.h b/third_party/protobuf/src/google/protobuf/extension_set.h
index cb1c23fe36a24ef497a7ea3e6b2701498d9e6b33..bca179be01ddbaa1c767860378d120e043eec801 100644
--- a/third_party/protobuf/src/google/protobuf/extension_set.h
+++ b/third_party/protobuf/src/google/protobuf/extension_set.h
@@ -731,13 +731,13 @@ class LIBPROTOBUF_EXPORT RepeatedPrimitiveGenericTypeTraits {
template<typename Type> friend class RepeatedPrimitiveTypeTraits;
static void InitializeDefaultRepeatedFields();
static void DestroyDefaultRepeatedFields();
- static const RepeatedField<int32>* cr_default_repeated_field_int32_;
- static const RepeatedField<int64>* cr_default_repeated_field_int64_;
- static const RepeatedField<uint32>* cr_default_repeated_field_uint32_;
- static const RepeatedField<uint64>* cr_default_repeated_field_uint64_;
- static const RepeatedField<double>* cr_default_repeated_field_double_;
- static const RepeatedField<float>* cr_default_repeated_field_float_;
- static const RepeatedField<bool>* cr_default_repeated_field_bool_;
+ static const RepeatedField<int32>* default_repeated_field_int32_;
+ static const RepeatedField<int64>* default_repeated_field_int64_;
+ static const RepeatedField<uint32>* default_repeated_field_uint32_;
+ static const RepeatedField<uint64>* default_repeated_field_uint64_;
+ static const RepeatedField<double>* default_repeated_field_double_;
+ static const RepeatedField<float>* default_repeated_field_float_;
+ static const RepeatedField<bool>* default_repeated_field_bool_;
};
#define PROTOBUF_DEFINE_PRIMITIVE_TYPE(TYPE, METHOD) \
@@ -769,7 +769,7 @@ template<> inline const RepeatedField<TYPE>* \
&repeated_primitive_generic_type_traits_once_init_, \
&RepeatedPrimitiveGenericTypeTraits::InitializeDefaultRepeatedFields); \
return RepeatedPrimitiveGenericTypeTraits:: \
- cr_default_repeated_field_##TYPE##_; \
+ default_repeated_field_##TYPE##_; \
} \
template<> inline const RepeatedField<TYPE>& \
RepeatedPrimitiveTypeTraits<TYPE>::GetRepeated(int number, \
@@ -821,8 +821,7 @@ class LIBPROTOBUF_EXPORT StringTypeTraits {
}
};
-LIBPROTOBUF_EXPORT extern ProtobufOnceType
- cr_repeated_string_type_traits_once_init_;
+LIBPROTOBUF_EXPORT extern ProtobufOnceType repeated_string_type_traits_once_init_;
class LIBPROTOBUF_EXPORT RepeatedStringTypeTraits {
public:
@@ -867,16 +866,15 @@ class LIBPROTOBUF_EXPORT RepeatedStringTypeTraits {
}
static const RepeatedFieldType* GetDefaultRepeatedField() {
- ::google::protobuf::GoogleOnceInit(
- &cr_repeated_string_type_traits_once_init_,
- &InitializeDefaultRepeatedFields);
- return cr_default_repeated_field_;
+ ::google::protobuf::GoogleOnceInit(&repeated_string_type_traits_once_init_,
+ &InitializeDefaultRepeatedFields);
+ return default_repeated_field_;
}
private:
static void InitializeDefaultRepeatedFields();
static void DestroyDefaultRepeatedFields();
- static const RepeatedFieldType* cr_default_repeated_field_;
+ static const RepeatedFieldType *default_repeated_field_;
};
// -------------------------------------------------------------------
@@ -1045,7 +1043,7 @@ class LIBPROTOBUF_EXPORT RepeatedMessageGenericTypeTraits {
template<typename Type> friend class RepeatedMessageTypeTraits;
static void InitializeDefaultRepeatedFields();
static void DestroyDefaultRepeatedFields();
- static const RepeatedFieldType* cr_default_repeated_field_;
+ static const RepeatedFieldType* default_repeated_field_;
};
template<typename Type> inline
@@ -1055,7 +1053,7 @@ template<typename Type> inline
&repeated_message_generic_type_traits_once_init_,
&RepeatedMessageGenericTypeTraits::InitializeDefaultRepeatedFields);
return reinterpret_cast<const RepeatedFieldType*>(
- RepeatedMessageGenericTypeTraits::cr_default_repeated_field_);
+ RepeatedMessageGenericTypeTraits::default_repeated_field_);
}
// -------------------------------------------------------------------
« no previous file with comments | « third_party/protobuf/src/google/protobuf/arena.cc ('k') | third_party/protobuf/src/google/protobuf/extension_set.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698