Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / protobuf / src / google / protobuf / compiler / cpp / cpp_string_field.cc

diff --git a/src/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc b/src/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc
index 9c0911a..0b58b98 100644 (file)
--- a/src/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc
+++ b/src/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc
@@ -53,7 +53,7 @@ void SetStringVariables(const FieldDescriptor* descriptor,
   (*variables)["default_length"] =
       SimpleItoa(descriptor->default_value_string().length());
   (*variables)["default_variable"] = descriptor->default_value_string().empty()
-      ? "&::google::protobuf::internal::kEmptyString"
+      ? "&::google::protobuf::internal::GetEmptyString()"
       : "_default_" + FieldName(descriptor) + "_";
   (*variables)["pointer_type"] =
       descriptor->type() == FieldDescriptor::TYPE_BYTES ? "void" : "char";