Protobuf: Remove protobuf globals patch

third_party/protobuf/src/google/protobuf/extension_set.h

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 713 matching lines @@
   static const RepeatedFieldType* GetDefaultRepeatedField();
 };
 
 LIBPROTOBUF_EXPORT extern ProtobufOnceType repeated_primitive_generic_type_traits_once_init_;
 
 class LIBPROTOBUF_EXPORT RepeatedPrimitiveGenericTypeTraits {
  private:
   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)                       \
 template<> inline TYPE PrimitiveTypeTraits<TYPE>::Get(                     \
     int number, const ExtensionSet& set, TYPE default_value) {             \
   return set.Get##METHOD(number, default_value);                           \
 }                                                                          \
 template<> inline void PrimitiveTypeTraits<TYPE>::Set(                     \
     int number, FieldType field_type, TYPE value, ExtensionSet* set) {     \
   set->Set##METHOD(number, field_type, value, NULL);                       \
@@ skipping 11 matching lines @@
     int number, FieldType field_type, bool is_packed,                      \
     TYPE value, ExtensionSet* set) {                                       \
   set->Add##METHOD(number, field_type, is_packed, value, NULL);            \
 }                                                                          \
 template<> inline const RepeatedField<TYPE>*                               \
     RepeatedPrimitiveTypeTraits<TYPE>::GetDefaultRepeatedField() {         \
   ::google::protobuf::GoogleOnceInit(                                                          \
       &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,             \
                                                const ExtensionSet& set) {  \
   return *reinterpret_cast<const RepeatedField<TYPE>*>(                    \
                             set.GetRawRepeatedField(                       \
                                 number, GetDefaultRepeatedField()));       \
 }                                                                          \
 template<> inline RepeatedField<TYPE>*                                     \
     RepeatedPrimitiveTypeTraits<TYPE>::MutableRepeated(int number,         \
@@ skipping 31 matching lines @@
   static inline void Set(int number, FieldType field_type,
                          const string& value, ExtensionSet* set) {
     set->SetString(number, field_type, value, NULL);
   }
   static inline string* Mutable(int number, FieldType field_type,
                                 ExtensionSet* set) {
     return set->MutableString(number, field_type, NULL);
   }
 };
 
-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:
   typedef const string& ConstType;
   typedef string* MutableType;
   typedef RepeatedStringTypeTraits Repeated;
 
   typedef RepeatedPtrField<string> RepeatedFieldType;
 
   static inline const string& Get(int number, const ExtensionSet& set,
@@ skipping 24 matching lines @@
 
   static inline RepeatedPtrField<string>*
       MutableRepeated(int number, FieldType field_type,
                       bool is_packed, ExtensionSet* set) {
     return reinterpret_cast<RepeatedPtrField<string>*>(
         set->MutableRawRepeatedField(number, field_type,
                                      is_packed, NULL));
   }
 
   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_;
 };
 
 // -------------------------------------------------------------------
 // EnumTypeTraits
 
 // ExtensionSet represents enums using integers internally, so we have to
 // static_cast around.
 template <typename Type, bool IsValid(int)>
 class EnumTypeTraits {
  public:
@@ skipping 148 matching lines @@
 
 // This class exists only to hold a generic default empty repeated field for all
 // message-type repeated field extensions.
 class LIBPROTOBUF_EXPORT RepeatedMessageGenericTypeTraits {
  public:
   typedef RepeatedPtrField< ::google::protobuf::MessageLite*> RepeatedFieldType;
  private:
   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
     const typename RepeatedMessageTypeTraits<Type>::RepeatedFieldType*
     RepeatedMessageTypeTraits<Type>::GetDefaultRepeatedField() {
   ::google::protobuf::GoogleOnceInit(
       &repeated_message_generic_type_traits_once_init_,
       &RepeatedMessageGenericTypeTraits::InitializeDefaultRepeatedFields);
   return reinterpret_cast<const RepeatedFieldType*>(
-      RepeatedMessageGenericTypeTraits::cr_default_repeated_field_);
+      RepeatedMessageGenericTypeTraits::default_repeated_field_);
 }
 
 // -------------------------------------------------------------------
 // ExtensionIdentifier
 
 // This is the type of actual extension objects.  E.g. if you have:
 //   extends Foo with optional int32 bar = 1234;
 // then "bar" will be defined in C++ as:
 //   ExtensionIdentifier<Foo, PrimitiveTypeTraits<int32>, 1, false> bar(1234);
 //
@@ skipping 190 matching lines @@
               _is_packed>& id) {                                              \
     return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,       \
                                               _is_packed, &_extensions_);     \
   }
 
 }  // namespace internal
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_EXTENSION_SET_H__