diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-11-17 01:13:37 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-11-17 01:13:37 +0000 |
| commit | cf186cf112e9944c3f9651f39bf473c5f84b0ca3 (patch) | |
| tree | 914960d80408e7f1ca9f6e780e56534ecff3af6e | |
| parent | fa037f15f9de10e04f1406d61ce58a7198258ffd (diff) | |
| download | googletest-cf186cf112e9944c3f9651f39bf473c5f84b0ca3.tar.gz | |
Call move() by qualified name (::testing::internal::move() or just internal::move()).
git-svn-id: http://googletest.googlecode.com/svn/trunk@696 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 6c2150d..dcb095c 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 <typename T> 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<typename To> -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 |