diff options
| author |  jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-18 00:47:59 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-18 00:47:59 +0000 |
| commit | 4de8f55113007fdc8e34107950e605fc0209d465 (patch) | |
| tree | 92b7da8757a7740d9e1f2d3ead233542947d8c8c /src/google/protobuf/generated_message_util.cc | |
| parent | c5553a3d18f80132b9079c5504bc0aa1f7f950a0 (diff) | |
down integrate to svn
Diffstat (limited to 'src/google/protobuf/generated_message_util.cc')
| -rw-r--r-- | src/google/protobuf/generated_message_util.cc | 6 |
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 |