Bringing in internal::shared_ptr into google:protobuf namespace.

Fixes #1029
pull/1029/head
Manjunath Kudlur 9 years ago
parent d03ef20039
commit 96537c461a
  1. 2
      python/google/protobuf/pyext/extension_dict.h
  2. 2
      python/google/protobuf/pyext/message.h
  3. 2
      python/google/protobuf/pyext/message_map_container.h
  4. 2
      python/google/protobuf/pyext/repeated_composite_container.h
  5. 2
      python/google/protobuf/pyext/repeated_scalar_container.h
  6. 2
      python/google/protobuf/pyext/scalar_map_container.h

@ -49,6 +49,8 @@ class FieldDescriptor;
#ifdef _SHARED_PTR_H
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif
namespace python {

@ -55,6 +55,8 @@ class MessageFactory;
#ifdef _SHARED_PTR_H
using std::shared_ptr;
using std::string;
#else
using internal::shared_ptr;
#endif
namespace python {

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

@ -51,6 +51,8 @@ class Message;
#ifdef _SHARED_PTR_H
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif
namespace python {

@ -50,6 +50,8 @@ class Message;
#ifdef _SHARED_PTR_H
using std::shared_ptr;
#else
using internal::shared_ptr;
#endif
namespace python {

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

Loading…
Cancel
Save