diff options
| author | Adam Cozzette <acozzette@google.com> | 2017-04-25 17:01:28 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-04-26 08:25:01 -0700 |
| commit | 7c76ac1735a3b8f4523856bbd67588b6ccc7f850 (patch) | |
| tree | b5198d8b815cfc08fdede21cd4a0969837b92930 /src/google/protobuf/io | |
| parent | 4920e27a488976c9993cef686d868a846868eb56 (diff) | |
| download | protobuf-7c76ac1735a3b8f4523856bbd67588b6ccc7f850.tar.gz protobuf-7c76ac1735a3b8f4523856bbd67588b6ccc7f850.tar.bz2 protobuf-7c76ac1735a3b8f4523856bbd67588b6ccc7f850.zip | |
Remove "using namespace std" from stubs/common.h
This prevents the contents of the std namespace from being effectively
pulled into the top-level namespace in all translation units that
include common.h. I left in individual using statements for a few common
things like std::set and std::map, because it did not seem worth going
through the churn of updating the whole codebase to fix those right now.
Diffstat (limited to 'src/google/protobuf/io')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream_impl_lite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream_impl_lite.h b/src/google/protobuf/io/zero_copy_stream_impl_lite.h index e4d6a024..6db1d695 100644 --- a/src/google/protobuf/io/zero_copy_stream_impl_lite.h +++ b/src/google/protobuf/io/zero_copy_stream_impl_lite.h @@ -399,7 +399,7 @@ inline std::pair<char*, bool> as_string_data(string* s) { #ifdef LANG_CXX11 return std::make_pair(p, true); #else - return make_pair(p, p != NULL); + return std::make_pair(p, p != NULL); #endif } |