aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-05-05 16:04:30 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-05-05 16:04:30 -0700
commit75e5898513d480c920486975389728dad3d158d6 (patch)
tree4c4a3fcbdd2a1c0997031d1cd201abac4111b909
parent17b6fc31eb8a9b65501cd7c53235a88efdc94394 (diff)
downloadprotobuf-75e5898513d480c920486975389728dad3d158d6.tar.gz
protobuf-75e5898513d480c920486975389728dad3d158d6.tar.bz2
protobuf-75e5898513d480c920486975389728dad3d158d6.zip
Fix the std::string error introduced in integration.
-rw-r--r--python/google/protobuf/pyext/message.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h
index 9dce198f..9a865147 100644
--- a/python/google/protobuf/pyext/message.h
+++ b/python/google/protobuf/pyext/message.h
@@ -54,7 +54,7 @@ class MessageFactory;
#ifdef _SHARED_PTR_H
using shared_ptr;
-using std::std::string;
+using ::std::string;
#else
using internal::shared_ptr;
#endif