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 | |
| parent | b9c4daadf7e27c0a533f86d567a89b691aa0ad9f (diff) | |
Add std:: namespace prefix to set and map (#3332)
* Remove using std::{set,map}
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/conformance_test.cc | 6 | ||||
| -rw-r--r-- | conformance/conformance_test.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index 67c90397..8fa9f53c 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -677,7 +677,7 @@ void ConformanceTestSuite::SetFailureList(const string& filename, std::inserter(expected_to_fail_, expected_to_fail_.end())); } -bool ConformanceTestSuite::CheckSetEmpty(const set<string>& set_to_check, +bool ConformanceTestSuite::CheckSetEmpty(const std::set<string>& set_to_check, const std::string& write_to_file, const std::string& msg) { if (set_to_check.empty()) { @@ -685,7 +685,7 @@ bool ConformanceTestSuite::CheckSetEmpty(const set<string>& set_to_check, } else { StringAppendF(&output_, "\n"); StringAppendF(&output_, "%s\n\n", msg.c_str()); - for (set<string>::const_iterator iter = set_to_check.begin(); + for (std::set<string>::const_iterator iter = set_to_check.begin(); iter != set_to_check.end(); ++iter) { StringAppendF(&output_, " %s\n", iter->c_str()); } @@ -694,7 +694,7 @@ bool ConformanceTestSuite::CheckSetEmpty(const set<string>& set_to_check, if (!write_to_file.empty()) { std::ofstream os(write_to_file); if (os) { - for (set<string>::const_iterator iter = set_to_check.begin(); + for (std::set<string>::const_iterator iter = set_to_check.begin(); iter != set_to_check.end(); ++iter) { os << *iter << "\n"; } 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_; |