diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-23 15:20:48 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-23 15:31:04 -0700 |
| commit | ba4290a82d9f1e59c614f786930d6d2fc86a6bce (patch) | |
| tree | b63681c309306c061801dca55c8adde5a5647555 /test | |
| parent | 850ffbcbddc6fb84155950f8acbb8f2339848ad3 (diff) | |
Removed 'using' conflicting with import
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpp/interop/stress_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index 91ef92af37..a1f6780809 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -80,10 +80,10 @@ DEFINE_string(test_cases, "", using std::make_pair; using std::pair; -using std::string; using std::thread; using std::vector; +using grpc::string; using grpc::testing::kTestCaseList; using grpc::testing::StressTestInteropClient; using grpc::testing::TestCaseType; |