1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/generated_message_util.cc b/src/google/protobuf/generated_message_util.cc
index 58d6bce4..c0726a67 100644
--- a/src/google/protobuf/generated_message_util.cc
+++ b/src/google/protobuf/generated_message_util.cc
@@ -36,6 +36,7 @@
 
 #include <limits>
 
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -48,12 +49,13 @@ double NaN() {
 }
 
 const ::std::string* empty_string_;
-ProtobufOnceType empty_string_once_init_;
+GOOGLE_PROTOBUF_DECLARE_ONCE(empty_string_once_init_);
 
 void InitEmptyString() {
-  empty_string_ = new std::string;
+  empty_string_ = new string;
 }
 
+
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google