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

Unified Diff: third_party/protobuf/src/google/protobuf/generated_message_util.cc

Issue 2746493002: Reland of Statically link libprotobuf_lite on Linux (Closed)
Patch Set: Really fix Win dbg Created 3 years, 9 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/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();
}
« no previous file with comments | « third_party/protobuf/src/google/protobuf/generated_message_util.h ('k') | third_party/protobuf/src/google/protobuf/globals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698