aboutsummaryrefslogtreecommitdiff
path: root/lib/gtest/test/gtest_stress_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gtest/test/gtest_stress_test.cc')
-rw-r--r--lib/gtest/test/gtest_stress_test.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gtest/test/gtest_stress_test.cc b/lib/gtest/test/gtest_stress_test.cc
index 4e7d9bff14..e7daa430df 100644
--- a/lib/gtest/test/gtest_stress_test.cc
+++ b/lib/gtest/test/gtest_stress_test.cc
@@ -50,7 +50,6 @@ namespace testing {
namespace {
using internal::Notification;
-using internal::String;
using internal::TestPropertyKeyIs;
using internal::ThreadWithParam;
using internal::scoped_ptr;
@@ -62,13 +61,13 @@ using internal::scoped_ptr;
// How many threads to create?
const int kThreadCount = 50;
-String IdToKey(int id, const char* suffix) {
+std::string IdToKey(int id, const char* suffix) {
Message key;
key << "key_" << id << "_" << suffix;
return key.GetString();
}
-String IdToString(int id) {
+std::string IdToString(int id) {
Message id_message;
id_message << id;
return id_message.GetString();