diff options
Diffstat (limited to 'src/google/protobuf/map_entry_lite.h')
| -rw-r--r-- | src/google/protobuf/map_entry_lite.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h index dc6ec917..aa8ff390 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -33,6 +33,7 @@ #include <assert.h> +#include <google/protobuf/stubs/casts.h> #include <google/protobuf/arena.h> #include <google/protobuf/arenastring.h> #include <google/protobuf/map.h> @@ -431,7 +432,7 @@ class MapEntryImpl : public Base { Value* value_ptr_; // On the fast path entry_ is not used. And, when entry_ is used, it's set // to mf_->NewEntry(), so in the arena case we must call entry_.release. - google::protobuf::scoped_ptr<MapEntryImpl> entry_; + std::unique_ptr<MapEntryImpl> entry_; }; protected: @@ -603,7 +604,7 @@ template <> struct FromHelper<WireFormatLite::TYPE_STRING> { static ArenaStringPtr From(const string& x) { ArenaStringPtr res; - TaggedPtr< ::std::string> ptr; + TaggedPtr<::std::string> ptr; ptr.Set(const_cast<string*>(&x)); res.UnsafeSetTaggedPointer(ptr); return res; @@ -613,7 +614,7 @@ template <> struct FromHelper<WireFormatLite::TYPE_BYTES> { static ArenaStringPtr From(const string& x) { ArenaStringPtr res; - TaggedPtr< ::std::string> ptr; + TaggedPtr<::std::string> ptr; ptr.Set(const_cast<string*>(&x)); res.UnsafeSetTaggedPointer(ptr); return res; |