eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fully-qualify use of scoped_ptr name

Browse Source
This commit is contained in:
kosak 2015-07-13 21:33:41 +00:00
parent 1197daf357
commit 0f3d673be1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/gtest_output_test_.cc
View File

@ -58,7 +58,6 @@ using testing::internal::ThreadWithParam;
#endif #endif
namespace posix = ::testing::internal::posix; namespace posix = ::testing::internal::posix;
using testing::internal::scoped_ptr;
// Tests catching fatal failures. // Tests catching fatal failures.
@ -515,7 +514,8 @@ class DeathTestAndMultiThreadsTest : public testing::Test {
private: private:
SpawnThreadNotifications notifications_; SpawnThreadNotifications notifications_;
scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> > thread_; testing::internal::scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> >
thread_;
}; };
#endif // GTEST_IS_THREADSAFE #endif // GTEST_IS_THREADSAFE

1
test/gtest_unittest.cc
View File

@ -287,7 +287,6 @@ using testing::internal::edit_distance::CreateUnifiedDiff;
using testing::internal::edit_distance::EditType; using testing::internal::edit_distance::EditType;
using testing::internal::kMaxRandomSeed; using testing::internal::kMaxRandomSeed;
using testing::internal::kTestTypeIdInGoogleTest; using testing::internal::kTestTypeIdInGoogleTest;
using testing::internal::scoped_ptr;
using testing::kMaxStackTraceDepth; using testing::kMaxStackTraceDepth;
#if GTEST_HAS_STREAM_REDIRECTION #if GTEST_HAS_STREAM_REDIRECTION