From 39a789e657a52e835c281233b63cc2a6bb387fd4 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Fri, 19 Jan 2018 16:46:57 -0800
Subject: Removed using statements from common.h

These statements pulled a bunch of symbols from the std namespace into
the global namespace. This commit removes all of them except for
std::string, which is a bit trickier to remove.
---
 conformance/conformance_test_runner.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conformance/conformance_test_runner.cc')

diff --git a/conformance/conformance_test_runner.cc b/conformance/conformance_test_runner.cc
index 7e91d388..09631f0c 100644
--- a/conformance/conformance_test_runner.cc
+++ b/conformance/conformance_test_runner.cc
@@ -264,7 +264,7 @@ void UsageError() {
   exit(1);
 }
 
-void ParseFailureList(const char *filename, vector<string>* failure_list) {
+void ParseFailureList(const char *filename, std::vector<string>* failure_list) {
   std::ifstream infile(filename);
 
   if (!infile.is_open()) {
@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) {
   google::protobuf::ConformanceTestSuite suite;
 
   string failure_list_filename;
-  vector<string> failure_list;
+  std::vector<string> failure_list;
 
   for (int arg = 1; arg < argc; ++arg) {
     if (strcmp(argv[arg], "--failure_list") == 0) {
-- 
cgit v1.2.3