generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Call move() by qualified name (::testing::internal::move() or just internal::move()).

Browse Source
This commit is contained in:
kosak 2014-11-17 01:13:37 +00:00
parent d3d142ef1c
commit 71271d2c95
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gtest/internal/gtest-port.h
View File

@ -1319,7 +1319,7 @@ inline void FlushInfoLog() { fflush(NULL); }
#if GTEST_HAS_STD_MOVE_ #if GTEST_HAS_STD_MOVE_
using std::move; using std::move;
#else // GTEST_LANG_CXX11 #else // GTEST_HAS_STD_MOVE_
template <typename T> template <typename T>
const T& move(const T& t) { const T& move(const T& t) {
return t; return t;
@ -1347,7 +1347,7 @@ const T& move(const T& t) {
// similar functions users may have (e.g., implicit_cast). The internal // similar functions users may have (e.g., implicit_cast). The internal
// namespace alone is not enough because the function can be found by ADL. // namespace alone is not enough because the function can be found by ADL.
template<typename To> 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 // When you upcast (that is, cast a pointer from type Foo to type
// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts // SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts