diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 12:22:18 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 12:22:18 -0700 |
| commit | 1a7a7fca804afa1cf67f8be5e71092898ba40334 (patch) | |
| tree | 04b3da27c71c607510f34a12cf7856a1b94181ae /python/google/protobuf/pyext/extension_dict.cc | |
| parent | c4f59dcc5c13debc572154c8f636b8a9361aacde (diff) | |
| download | protobuf-1a7a7fca804afa1cf67f8be5e71092898ba40334.tar.gz protobuf-1a7a7fca804afa1cf67f8be5e71092898ba40334.tar.bz2 protobuf-1a7a7fca804afa1cf67f8be5e71092898ba40334.zip | |
Merge from google internal
Diffstat (limited to 'python/google/protobuf/pyext/extension_dict.cc')
| -rw-r--r-- | python/google/protobuf/pyext/extension_dict.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.cc b/python/google/protobuf/pyext/extension_dict.cc index 43ee5d15..6830b10d 100644 --- a/python/google/protobuf/pyext/extension_dict.cc +++ b/python/google/protobuf/pyext/extension_dict.cc @@ -32,6 +32,10 @@ // Author: tibell@google.com (Johan Tibell) #include <google/protobuf/pyext/extension_dict.h> +#include <memory> +#ifndef _SHARED_PTR_H +#include <google/protobuf/stubs/shared_ptr.h> +#endif #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> @@ -45,7 +49,6 @@ #include <google/protobuf/pyext/repeated_composite_container.h> #include <google/protobuf/pyext/repeated_scalar_container.h> #include <google/protobuf/pyext/scoped_pyobject_ptr.h> -#include <google/protobuf/stubs/shared_ptr.h> #if PY_MAJOR_VERSION >= 3 #if PY_VERSION_HEX < 0x03030000 |