From 7c76ac1735a3b8f4523856bbd67588b6ccc7f850 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 25 Apr 2017 17:01:28 -0700 Subject: 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. --- src/google/protobuf/io/zero_copy_stream_impl_lite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google/protobuf/io') 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 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 } -- cgit v1.2.3