From 126082c371d2320255ac8ff7d68bef25a919572d Mon Sep 17 00:00:00 2001
From: tanderson-google <thomasanderson@google.com>
Date: Sun, 9 Jul 2017 20:31:50 -0700
Subject: Add std:: namespace prefix to set and map (#3332)

* Remove using std::{set,map}
---
 conformance/conformance_test.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conformance/conformance_test.h')

diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 4e40a6ac..581c7472 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -205,7 +205,7 @@ class ConformanceTestSuite {
   void TestValidDataForType(
       google::protobuf::FieldDescriptor::Type,
       std::vector<std::pair<std::string, std::string>> values);
-  bool CheckSetEmpty(const set<string>& set_to_check,
+  bool CheckSetEmpty(const std::set<string>& set_to_check,
                      const std::string& write_to_file, const std::string& msg);
   ConformanceTestRunner* runner_;
   int successes_;
-- 
cgit v1.2.3