From 37c7426b4782ea01f40875b30782ab5ef0ac99b6 Mon Sep 17 00:00:00 2001
From: "xiaofeng@google.com"
 <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Thu, 13 Feb 2014 22:09:48 +0000
Subject: Replace kEmptyString wth OnceInit initialized string*

---
 src/google/protobuf/generated_message_util.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/generated_message_util.cc')

diff --git a/src/google/protobuf/generated_message_util.cc b/src/google/protobuf/generated_message_util.cc
index ac321501..58d6bce4 100644
--- a/src/google/protobuf/generated_message_util.cc
+++ b/src/google/protobuf/generated_message_util.cc
@@ -47,7 +47,12 @@ double NaN() {
   return std::numeric_limits<double>::quiet_NaN();
 }
 
-const ::std::string kEmptyString;
+const ::std::string* empty_string_;
+ProtobufOnceType empty_string_once_init_;
+
+void InitEmptyString() {
+  empty_string_ = new std::string;
+}
 
 }  // namespace internal
 }  // namespace protobuf
-- 
cgit v1.2.3