From 0f3d673be15d7e6e01dccc9a7e66097fe7592c8f Mon Sep 17 00:00:00 2001
From: kosak <kosak@google.com>
Date: Mon, 13 Jul 2015 21:33:41 +0000
Subject: [PATCH] fully-qualify use of scoped_ptr name

---
 test/gtest_output_test_.cc | 4 ++--
 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 5361d8d8..adeb42c8 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 5509a6b2..774fa833 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