organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1494 from pherl/master

Browse source 
Fix the std::string error introduced in integration.
This commit is contained in:
Jisi Liu 2016-05-06 15:40:58 -07:00
commit 9d0f56058a
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
python/google/protobuf/pyext/extension_dict.h
View file

@ -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

2
python/google/protobuf/pyext/map_container.h
View file

@ -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

4
python/google/protobuf/pyext/message.h
View file

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

2
python/google/protobuf/pyext/repeated_composite_container.h
View file

@ -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

2
python/google/protobuf/pyext/repeated_scalar_container.h
View file

@ -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