aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util
diff options
context:
space:
mode:
authorGravatar Adam Cozzette <acozzette@google.com>2017-04-25 17:01:28 -0700
committerGravatar Adam Cozzette <acozzette@google.com>2017-04-26 08:25:01 -0700
commit7c76ac1735a3b8f4523856bbd67588b6ccc7f850 (patch)
treeb5198d8b815cfc08fdede21cd4a0969837b92930 /src/google/protobuf/util
parent4920e27a488976c9993cef686d868a846868eb56 (diff)
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/util')
-rw-r--r--src/google/protobuf/util/delimited_message_util_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/delimited_message_util_test.cc b/src/google/protobuf/util/delimited_message_util_test.cc
index b261d43c..157a8411 100644
--- a/src/google/protobuf/util/delimited_message_util_test.cc
+++ b/src/google/protobuf/util/delimited_message_util_test.cc
@@ -15,7 +15,7 @@ namespace protobuf {
namespace util {
TEST(DelimitedMessageUtilTest, DelimitedMessages) {
- stringstream stream;
+ std::stringstream stream;
{
protobuf_unittest::TestAllTypes message1;