diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 12:32:21 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 12:32:21 -0700 |
| commit | 14be563f00b5fd04e50c44420bef6e5061080156 (patch) | |
| tree | 305de6fec737246373cd50f3accdf02ebf461037 /src/google/protobuf/compiler/cpp/cpp_message.cc | |
| parent | ba8692fbade4ba329cc4531e286ab5a8e0821d97 (diff) | |
| download | protobuf-14be563f00b5fd04e50c44420bef6e5061080156.tar.gz protobuf-14be563f00b5fd04e50c44420bef6e5061080156.tar.bz2 protobuf-14be563f00b5fd04e50c44420bef6e5061080156.zip | |
Down-integrate proto2 namespace fix.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 5e9e1a6d..e219d784 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -941,7 +941,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* printer) { "public:\n" "#if $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n" " static const char* _InternalParse(const char* begin, const char* " - "end, void* object, ::proto2::internal::ParseContext* ctx);\n" + "end, void* object, ::$proto_ns$::internal::ParseContext* ctx);\n" "#endif // $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n" " typedef ::$proto_ns$::internal::MapEntry$lite$<$classname$, \n" " $key_cpp$, $val_cpp$,\n" @@ -1158,7 +1158,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* printer) { "size_t ByteSizeLong() const final;\n" "#if $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n" "static const char* _InternalParse(const char* begin, const char* end, " - "void* object, ::proto2::internal::ParseContext* ctx);\n" + "void* object, ::$proto_ns$::internal::ParseContext* ctx);\n" "::$proto_ns$::internal::ParseFunc _ParseFunc() const final { return " "_InternalParse; }\n" "#else\n" @@ -1170,7 +1170,8 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* printer) { format( "#if $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n" "static const char* InternalParseMessageSetItem(const char* begin, " - "const char* end, void* object, ::proto2::internal::ParseContext* " + "const char* end, void* object, " + "::$proto_ns$::internal::ParseContext* " "ctx);\n" "#endif // $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n"); } @@ -1879,7 +1880,7 @@ void MessageGenerator::GenerateClassMethods(io::Printer* printer) { format( "#if $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n" "const char* $classname$::_InternalParse(const char* begin, const " - "char* end, void* object, ::proto2::internal::ParseContext* ctx) { " + "char* end, void* object, ::$proto_ns$::internal::ParseContext* ctx) { " "return end; }\n" "#endif // $GOOGLE_PROTOBUF$_ENABLE_EXPERIMENTAL_PARSER\n"); format("\n"); |