diff options
author | tanderson-google <thomasanderson@google.com> | 2017-07-09 20:31:50 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@gmail.com> | 2017-07-09 20:31:50 -0700 |
commit | 126082c371d2320255ac8ff7d68bef25a919572d (patch) | |
tree | 72bf0b5b5d8ee5249d2128bc91936733eb42294b /conformance/conformance_test.h | |
parent | b9c4daadf7e27c0a533f86d567a89b691aa0ad9f (diff) | |
download | protobuf-126082c371d2320255ac8ff7d68bef25a919572d.tar.gz protobuf-126082c371d2320255ac8ff7d68bef25a919572d.tar.bz2 protobuf-126082c371d2320255ac8ff7d68bef25a919572d.zip |
Add std:: namespace prefix to set and map (#3332)
* Remove using std::{set,map}
Diffstat (limited to 'conformance/conformance_test.h')
-rw-r--r-- | conformance/conformance_test.h | 2 |
1 files changed, 1 insertions, 1 deletions
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_; |