From 71271d2c95fdf54a3782edea360dca188f926019 Mon Sep 17 00:00:00 2001 From: kosak Date: Mon, 17 Nov 2014 01:13:37 +0000 Subject: Call move() by qualified name (::testing::internal::move() or just internal::move()). --- include/gtest/internal/gtest-port.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 6c2150df..dcb095cb 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -1319,7 +1319,7 @@ inline void FlushInfoLog() { fflush(NULL); } #if GTEST_HAS_STD_MOVE_ using std::move; -#else // GTEST_LANG_CXX11 +#else // GTEST_HAS_STD_MOVE_ template const T& move(const T& t) { return t; @@ -1347,7 +1347,7 @@ const T& move(const T& t) { // similar functions users may have (e.g., implicit_cast). The internal // namespace alone is not enough because the function can be found by ADL. template -inline To ImplicitCast_(To x) { return move(x); } +inline To ImplicitCast_(To x) { return ::testing::internal::move(x); } // When you upcast (that is, cast a pointer from type Foo to type // SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts -- cgit v1.2.3