diff options
author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-13 21:33:41 +0000 |
---|---|---|
committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-13 21:33:41 +0000 |
commit | 926335d19b2b9ed9714b3eaf70c2e5cf53b5cbe6 (patch) | |
tree | c1753850ce21fadf02077a46cd004c0b3e51f7d9 | |
parent | a734b14b9b9d8f267e4e83fae0be327331426ae7 (diff) | |
download | googletest-926335d19b2b9ed9714b3eaf70c2e5cf53b5cbe6.tar.gz |
fully-qualify use of scoped_ptr name
git-svn-id: http://googletest.googlecode.com/svn/trunk@712 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r-- | test/gtest_output_test_.cc | 4 | ||||
-rw-r--r-- | test/gtest_unittest.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/gtest_output_test_.cc b/test/gtest_output_test_.cc index 5361d8d..adeb42c 100644 --- a/test/gtest_output_test_.cc +++ b/test/gtest_output_test_.cc @@ -58,7 +58,6 @@ using testing::internal::ThreadWithParam; #endif namespace posix = ::testing::internal::posix; -using testing::internal::scoped_ptr; // Tests catching fatal failures. @@ -515,7 +514,8 @@ class DeathTestAndMultiThreadsTest : public testing::Test { private: SpawnThreadNotifications notifications_; - scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> > thread_; + testing::internal::scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> > + thread_; }; #endif // GTEST_IS_THREADSAFE diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 5509a6b..774fa83 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -287,7 +287,6 @@ using testing::internal::edit_distance::CreateUnifiedDiff; using testing::internal::edit_distance::EditType; using testing::internal::kMaxRandomSeed; using testing::internal::kTestTypeIdInGoogleTest; -using testing::internal::scoped_ptr; using testing::kMaxStackTraceDepth; #if GTEST_HAS_STREAM_REDIRECTION |