diff options
| author | kosak <kosak@google.com> | 2015-07-13 21:33:41 (GMT) |
|---|---|---|
| committer | kosak <kosak@google.com> | 2015-07-13 21:33:41 (GMT) |
| commit | 0f3d673be15d7e6e01dccc9a7e66097fe7592c8f (patch) | |
| tree | c1753850ce21fadf02077a46cd004c0b3e51f7d9 /test/gtest_output_test_.cc | |
| parent | 1197daf3571161590dce2bc4879512ef7bc1ba67 (diff) | |
| download | googletest-0f3d673be15d7e6e01dccc9a7e66097fe7592c8f.zip googletest-0f3d673be15d7e6e01dccc9a7e66097fe7592c8f.tar.gz googletest-0f3d673be15d7e6e01dccc9a7e66097fe7592c8f.tar.bz2 | |
fully-qualify use of scoped_ptr name
Diffstat (limited to 'test/gtest_output_test_.cc')
| -rw-r--r-- | test/gtest_output_test_.cc | 4 |
1 files changed, 2 insertions, 2 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 |