aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util
diff options
context:
space:
mode:
authorGravatar Adam Cozzette <acozzette@gmail.com>2017-04-26 13:56:24 -0700
committerGravatar GitHub <noreply@github.com>2017-04-26 13:56:24 -0700
commitcbd08cb7d11fabbdf471d49ed13e5082033bd2b5 (patch)
tree6814d8cbb78d58aee7827016d029fe6ac2694967 /src/google/protobuf/util
parent54d1701f6cd1df167db6b73320e5fe6361907d2c (diff)
parent7c76ac1735a3b8f4523856bbd67588b6ccc7f850 (diff)
Merge pull request #3018 from acozzette/using-namespace-std
Remove "using namespace std" from stubs/common.h
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;