aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/cpp/cpp_message.cc
diff options
context:
space:
mode:
authorGravatar Srivats P <pstavirs@users.noreply.github.com>2016-08-29 22:57:46 +0530
committerGravatar Srivats P <pstavirs@users.noreply.github.com>2016-08-29 22:57:46 +0530
commiteedc7be6803924e158e6a08471bbdf1908c7a93e (patch)
tree1bf4550c5d5d585bda78ad09f8b2c6f7a87b5211 /src/google/protobuf/compiler/cpp/cpp_message.cc
parent3d9d1a1255583bac550f7bf94f3016e8c238fa5e (diff)
Restore New*Callback into google::protobuf namespace since these are used by the service stubs code
Fixes #1966
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_message.cc')
-rw-r--r--src/google/protobuf/compiler/cpp/cpp_message.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
index 405a5fed..69f216ab 100644
--- a/src/google/protobuf/compiler/cpp/cpp_message.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -2956,7 +2956,7 @@ GenerateMergeFromCodedStream(io::Printer* printer) {
// on the CodedOutputStream.
printer->Print(
" ::google::protobuf::io::LazyStringOutputStream unknown_fields_string(\n"
- " ::google::protobuf::internal::NewPermanentCallback(\n"
+ " ::google::protobuf::NewPermanentCallback(\n"
" &MutableUnknownFieldsFor$classname$, this));\n"
" ::google::protobuf::io::CodedOutputStream unknown_fields_stream(\n"
" &unknown_fields_string, false);\n",