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/api.pb.h | |
| 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/api.pb.h')
| -rw-r--r-- | src/google/protobuf/api.pb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index cea0ffe1..5af8aaf2 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -132,7 +132,7 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message /* @@protoc_in size_t ByteSizeLong() const final; #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::proto2::internal::ParseContext* ctx); + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } #else bool MergePartialFromCodedStream( @@ -322,7 +322,7 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message /* @@protoc size_t ByteSizeLong() const final; #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::proto2::internal::ParseContext* ctx); + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } #else bool MergePartialFromCodedStream( @@ -505,7 +505,7 @@ class LIBPROTOBUF_EXPORT Mixin : public ::google::protobuf::Message /* @@protoc_ size_t ByteSizeLong() const final; #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::proto2::internal::ParseContext* ctx); + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } #else bool MergePartialFromCodedStream( |