Protobuf: Remove protobuf globals patch

third_party/protobuf/src/google/protobuf/arena.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 52 matching lines @@
 class Arena;       // defined below
 class Message;     // message.h
 
 namespace internal {
 class ArenaString; // arenastring.h
 class LazyField;   // lazy_field.h
 
 template<typename Type>
 class GenericTypeHandler; // repeated_field.h
 
-LIBPROTOBUF_EXPORT extern google::protobuf::internal::SequenceNumber
-    cr_lifecycle_id_generator_;
-
 // Templated cleanup methods.
 template<typename T> void arena_destruct_object(void* object) {
   reinterpret_cast<T*>(object)->~T();
 }
 template<typename T> void arena_delete_object(void* object) {
   delete reinterpret_cast<T*>(object);
 }
 inline void arena_free(void* object, size_t /* size */) {
   free(object);
 }
@@ skipping 462 matching lines @@
   friend class internal::LazyField;    // For CreateMaybeMessage.
 
   struct ThreadCache {
     // The ThreadCache is considered valid as long as this matches the
     // lifecycle_id of the arena being used.
     int64 last_lifecycle_id_seen;
     Block* last_block_used_;
   };
 
   static const size_t kHeaderSize = sizeof(Block);
+  static google::protobuf::internal::SequenceNumber lifecycle_id_generator_;
 #if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
   // Android ndk does not support GOOGLE_THREAD_LOCAL keyword so we use a custom thread
   // local storage class we implemented.
   // iOS also does not support the GOOGLE_THREAD_LOCAL keyword.
-  static ThreadCache& cr_thread_cache();
+  static ThreadCache& thread_cache();
 #elif defined(PROTOBUF_USE_DLLS)
   // Thread local variables cannot be exposed through DLL interface but we can
   // wrap them in static functions.
-  static ThreadCache& cr_thread_cache();
+  static ThreadCache& thread_cache();
 #else
   static GOOGLE_THREAD_LOCAL ThreadCache thread_cache_;
-  static ThreadCache& cr_thread_cache() {
-    return thread_cache_;
-  }
+  static ThreadCache& thread_cache() { return thread_cache_; }
 #endif
 
   // SFINAE for skipping addition to delete list for a message type when created
   // with CreateMessage. This is mainly to skip proto2/proto1 message objects
   // with cc_enable_arenas=true from being part of the delete list. Also, note,
   // compiler will optimize out the branch in CreateInternal<T>.
   template<typename T>
   static inline bool SkipDeleteList(typename T::DestructorSkippable_*) {
     return true;
   }
@@ skipping 287 matching lines @@
   // TODO(rohananil, cfallin): We could pass in a sub-arena into this method
   // to avoid polluting blocks of this arena with list nodes. This would help in
   // mixed mode (where many protobufs have cc_enable_arenas=false), and is an
   // alternative to a chunked linked-list, but with extra overhead of *next.
   void AddListNode(void* elem, void (*cleanup)(void*));
   // Delete or Destruct all objects owned by the arena.
   void CleanupList();
   uint64 ResetInternal();
 
   inline void SetThreadCacheBlock(Block* block) {
-    cr_thread_cache().last_block_used_ = block;
-    cr_thread_cache().last_lifecycle_id_seen = lifecycle_id_;
+    thread_cache().last_block_used_ = block;
+    thread_cache().last_lifecycle_id_seen = lifecycle_id_;
   }
 
   int64 lifecycle_id_;  // Unique for each arena. Changes on Reset().
 
   google::protobuf::internal::AtomicWord blocks_;  // Head of linked list of all allocated blocks
   google::protobuf::internal::AtomicWord hint_;    // Fast thread-local block access
 
   // Node contains the ptr of the object to be cleaned up and the associated
   // cleanup function ptr.
   struct Node {
@@ skipping 29 matching lines @@
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Arena);
 };
 
 // Defined above for supporting environments without RTTI.
 #undef RTTI_TYPE_ID
 
 }  // namespace protobuf
 
 }  // namespace google
 #endif  // GOOGLE_PROTOBUF_ARENA_H__