aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance
diff options
context:
space:
mode:
authorGravatar Adam Cozzette <acozzette@google.com>2018-01-19 16:46:57 -0800
committerGravatar Adam Cozzette <acozzette@acozzette0.svl.corp.google.com>2018-01-26 16:17:14 -0800
commit39a789e657a52e835c281233b63cc2a6bb387fd4 (patch)
tree18954017db14eb09c290ddbe0425a212b14d2b28 /conformance
parentc236896ec5a7f9c0b021f14be61ee2e0a2c7a91b (diff)
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.
Diffstat (limited to 'conformance')
-rw-r--r--conformance/conformance_test.cc2
-rw-r--r--conformance/conformance_test_runner.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index 98c2eae4..e4b046dc 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -754,7 +754,7 @@ void ConformanceTestSuite::TestValidDataForType(
}
void ConformanceTestSuite::SetFailureList(const string& filename,
- const vector<string>& failure_list) {
+ const std::vector<string>& failure_list) {
failure_list_filename_ = filename;
expected_to_fail_.clear();
std::copy(failure_list.begin(), failure_list.end(),
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) {