diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
| commit | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (patch) | |
| tree | 64370726fe469f8dfca7b14f8b8cb80b6cc856f6 /src/google/protobuf/dynamic_message.cc | |
| parent | 0087da9d4775f79c67362cc89c653f3a33a9bae2 (diff) | |
Down-integrate from google internal.
Diffstat (limited to 'src/google/protobuf/dynamic_message.cc')
| -rw-r--r-- | src/google/protobuf/dynamic_message.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc index 2324d952..091fc975 100644 --- a/src/google/protobuf/dynamic_message.cc +++ b/src/google/protobuf/dynamic_message.cc @@ -64,6 +64,10 @@ #include <algorithm> #include <google/protobuf/stubs/hash.h> +#include <memory> +#ifndef _SHARED_PTR_H +#include <google/protobuf/stubs/shared_ptr.h> +#endif #include <google/protobuf/stubs/scoped_ptr.h> #include <google/protobuf/stubs/common.h> @@ -229,8 +233,8 @@ class DynamicMessage : public Message { // Warning: The order in which the following pointers are defined is // important (the prototype must be deleted *before* the offsets). - scoped_array<int> offsets; - scoped_ptr<const GeneratedMessageReflection> reflection; + google::protobuf::scoped_array<int> offsets; + google::protobuf::scoped_ptr<const GeneratedMessageReflection> reflection; // Don't use a scoped_ptr to hold the prototype: the destructor for // DynamicMessage needs to know whether it is the prototype, and does so by // looking back at this field. This would assume details about the |