Commit 96537c46 authored by Manjunath Kudlur's avatar Manjunath Kudlur

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

Fixes #1029
parent d03ef200
...@@ -49,6 +49,8 @@ class FieldDescriptor; ...@@ -49,6 +49,8 @@ class FieldDescriptor;
#ifdef _SHARED_PTR_H #ifdef _SHARED_PTR_H
using std::shared_ptr; using std::shared_ptr;
#else
using internal::shared_ptr;
#endif #endif
namespace python { namespace python {
......
...@@ -55,6 +55,8 @@ class MessageFactory; ...@@ -55,6 +55,8 @@ class MessageFactory;
#ifdef _SHARED_PTR_H #ifdef _SHARED_PTR_H
using std::shared_ptr; using std::shared_ptr;
using std::string; using std::string;
#else
using internal::shared_ptr;
#endif #endif
namespace python { namespace python {
......
...@@ -47,6 +47,8 @@ class Message; ...@@ -47,6 +47,8 @@ class Message;
#ifdef _SHARED_PTR_H #ifdef _SHARED_PTR_H
using std::shared_ptr; using std::shared_ptr;
#else
using internal::shared_ptr;
#endif #endif
namespace python { namespace python {
......
...@@ -51,6 +51,8 @@ class Message; ...@@ -51,6 +51,8 @@ class Message;
#ifdef _SHARED_PTR_H #ifdef _SHARED_PTR_H
using std::shared_ptr; using std::shared_ptr;
#else
using internal::shared_ptr;
#endif #endif
namespace python { namespace python {
......
...@@ -50,6 +50,8 @@ class Message; ...@@ -50,6 +50,8 @@ class Message;
#ifdef _SHARED_PTR_H #ifdef _SHARED_PTR_H
using std::shared_ptr; using std::shared_ptr;
#else
using internal::shared_ptr;
#endif #endif
namespace python { namespace python {
......
...@@ -47,6 +47,8 @@ class Message; ...@@ -47,6 +47,8 @@ class Message;
#ifdef _SHARED_PTR_H #ifdef _SHARED_PTR_H
using std::shared_ptr; using std::shared_ptr;
#else
using internal::shared_ptr;
#endif #endif
namespace python { namespace python {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment