diff options
| author | Jisi Liu <liujisi@google.com> | 2016-07-07 09:19:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 09:19:40 -0700 |
| commit | eaf3451cbb2971c0bfc0e1a75a9c67f939870e6f (patch) | |
| tree | 07282389b2254b862b4b74e90442c72593b344d5 | |
| parent | 0d5091ee8878484ccd407aa58cb80c9cac7e2d61 (diff) | |
| parent | d84d0ca13e7898f5233901535f17763cbc187ce3 (diff) | |
| download | protobuf-eaf3451cbb2971c0bfc0e1a75a9c67f939870e6f.tar.gz protobuf-eaf3451cbb2971c0bfc0e1a75a9c67f939870e6f.tar.bz2 protobuf-eaf3451cbb2971c0bfc0e1a75a9c67f939870e6f.zip | |
Merge pull request #1753 from xfxyjwf/fixup
Fix problems detected when integrating the code to our internal repo.
| -rw-r--r-- | src/google/protobuf/stubs/stringpiece.h | 8 | ||||
| -rw-r--r-- | src/google/protobuf/util/internal/proto_writer.cc | 4 |
2 files changed, 2 insertions, 10 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 <class Allocator> - StringPiece( // NOLINT(runtime/explicit) - const basic_string<char, std::char_traits<char>, Allocator>& str) - : ptr_(str.data()), length_(0) { - length_ = CheckedSsizeTFromSizeT(str.size()); - } -#endif StringPiece(const char* offset, stringpiece_ssize_type len) : ptr_(offset), length_(len) { 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()) {} |