diff options
| author | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
| commit | aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5 (patch) | |
| tree | f7ce45e0922c46eecd01a36afb6d8ec5a71c8155 /python/google/protobuf/pyext/repeated_composite_container.h | |
| parent | 452e2b2c5c607ab5d63cd813793f1aa960f19d1c (diff) | |
| parent | 7630a83767dcee42d12bac68021f53aeb3d288f8 (diff) | |
| download | protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.gz protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.bz2 protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.zip | |
Merge pull request #1381 from pherl/internal-merge
Merge Google internal changes to an internal branch
Diffstat (limited to 'python/google/protobuf/pyext/repeated_composite_container.h')
| -rw-r--r-- | python/google/protobuf/pyext/repeated_composite_container.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h index 58d37b02..442ce7e3 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.h +++ b/python/google/protobuf/pyext/repeated_composite_container.h @@ -50,7 +50,7 @@ class FieldDescriptor; class Message; #ifdef _SHARED_PTR_H -using std::shared_ptr; +using shared_ptr; #else using internal::shared_ptr; #endif |