Index: third_party/protobuf/src/google/protobuf/generated_message_util.cc |
diff --git a/third_party/protobuf/src/google/protobuf/generated_message_util.cc b/third_party/protobuf/src/google/protobuf/generated_message_util.cc |
index 334051a013e4098afea6eed399a54caae30ac729..5807a3454210758653d24030b7e5b45e024ebe48 100644 |
--- a/third_party/protobuf/src/google/protobuf/generated_message_util.cc |
+++ b/third_party/protobuf/src/google/protobuf/generated_message_util.cc |
@@ -48,20 +48,18 @@ double NaN() { |
return std::numeric_limits<double>::quiet_NaN(); |
} |
-const ::std::string* empty_string_; |
-GOOGLE_PROTOBUF_DECLARE_ONCE(empty_string_once_init_); |
- |
void DeleteEmptyString() { |
- delete empty_string_; |
+ delete cr_empty_string_; |
} |
void InitEmptyString() { |
- empty_string_ = new string; |
+ cr_empty_string_ = new string; |
OnShutdown(&DeleteEmptyString); |
} |
const ::std::string& GetEmptyString() { |
- ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString); |
+ ::google::protobuf::GoogleOnceInit(&cr_empty_string_once_init_, |
+ &InitEmptyString); |
return GetEmptyStringAlreadyInited(); |
} |