From a29a9c5d491f2a25b108f474802abad95829a027 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Wed, 6 Jul 2016 15:37:27 -0700 Subject: Don't support global ::string in stringpiece.h --- src/google/protobuf/stubs/stringpiece.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/google/protobuf/stubs/stringpiece.h b/src/google/protobuf/stubs/stringpiece.h index 91671659..8910688b 100644 --- a/src/google/protobuf/stubs/stringpiece.h +++ b/src/google/protobuf/stubs/stringpiece.h @@ -222,14 +222,6 @@ class LIBPROTOBUF_EXPORT StringPiece { : ptr_(str.data()), length_(0) { length_ = CheckedSsizeTFromSizeT(str.size()); } -#if defined(HAS_GLOBAL_STRING) - template - StringPiece( // NOLINT(runtime/explicit) - const basic_string, Allocator>& str) - : ptr_(str.data()), length_(0) { - length_ = CheckedSsizeTFromSizeT(str.size()); - } -#endif StringPiece(const char* offset, stringpiece_ssize_type len) : ptr_(offset), length_(len) { -- cgit v1.2.3 From d84d0ca13e7898f5233901535f17763cbc187ce3 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Wed, 6 Jul 2016 15:38:10 -0700 Subject: Fix data member declaration order. --- src/google/protobuf/util/internal/proto_writer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/google/protobuf/util/internal/proto_writer.cc b/src/google/protobuf/util/internal/proto_writer.cc index 3e09c9bb..7a1a6cbd 100644 --- a/src/google/protobuf/util/internal/proto_writer.cc +++ b/src/google/protobuf/util/internal/proto_writer.cc @@ -64,6 +64,7 @@ ProtoWriter::ProtoWriter(TypeResolver* type_resolver, typeinfo_(TypeInfo::NewTypeInfo(type_resolver)), own_typeinfo_(true), done_(false), + ignore_unknown_fields_(false), element_(NULL), size_insert_(), output_(output), @@ -71,7 +72,6 @@ ProtoWriter::ProtoWriter(TypeResolver* type_resolver, adapter_(&buffer_), stream_(new CodedOutputStream(&adapter_)), listener_(listener), - ignore_unknown_fields_(false), invalid_depth_(0), tracker_(new ObjectLocationTracker()) {} @@ -82,6 +82,7 @@ ProtoWriter::ProtoWriter(const TypeInfo* typeinfo, typeinfo_(typeinfo), own_typeinfo_(false), done_(false), + ignore_unknown_fields_(false), element_(NULL), size_insert_(), output_(output), @@ -89,7 +90,6 @@ ProtoWriter::ProtoWriter(const TypeInfo* typeinfo, adapter_(&buffer_), stream_(new CodedOutputStream(&adapter_)), listener_(listener), - ignore_unknown_fields_(false), invalid_depth_(0), tracker_(new ObjectLocationTracker()) {} -- cgit v1.2.3