Fix using std::shared_ptr

pull/1494/head
Jisi Liu 9 years ago
parent 75e5898513
commit f8a5c5f746
  1. 2
      python/google/protobuf/pyext/extension_dict.h
  2. 2
      python/google/protobuf/pyext/map_container.h
  3. 2
      python/google/protobuf/pyext/message.h
  4. 2
      python/google/protobuf/pyext/repeated_composite_container.h
  5. 2
      python/google/protobuf/pyext/repeated_scalar_container.h

@ -48,7 +48,7 @@ class Message;
class FieldDescriptor;
#ifdef _SHARED_PTR_H
using shared_ptr;
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif

@ -47,7 +47,7 @@ namespace protobuf {
class Message;
#ifdef _SHARED_PTR_H
using shared_ptr;
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif

@ -53,7 +53,7 @@ class DescriptorPool;
class MessageFactory;
#ifdef _SHARED_PTR_H
using shared_ptr;
using std::shared_ptr;
using ::std::string;
#else
using internal::shared_ptr;

@ -50,7 +50,7 @@ class FieldDescriptor;
class Message;
#ifdef _SHARED_PTR_H
using shared_ptr;
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif

@ -49,7 +49,7 @@ namespace protobuf {
class Message;
#ifdef _SHARED_PTR_H
using shared_ptr;
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif

Loading…
Cancel
Save