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 
Pull in gtest 696.
This commit is contained in:
kosak
2014-11-17 01:14:16 +00:00
parent 389bad61e2
commit d370f85b02
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/gmock/gmock-actions.h
View File

@@ -463,7 +463,7 @@ class ActionAdaptor : public ActionInterface<F1> {
// on return. Useful for move-only types, but could be used on any type.
template <typename T>
struct ByMoveWrapper {
explicit ByMoveWrapper(T value) : payload(move(value)) {}
explicit ByMoveWrapper(T value) : payload(internal::move(value)) {}
T payload;
};
@@ -497,7 +497,7 @@ class ReturnAction {
// Constructs a ReturnAction object from the value to be returned.
// 'value' is passed by value instead of by const reference in order
// to allow Return("string literal") to compile.
explicit ReturnAction(R value) : value_(new R(move(value))) {}
explicit ReturnAction(R value) : value_(new R(internal::move(value))) {}
// This template type conversion operator allows Return(x) to be
// used in ANY function that returns x's type.
@@ -561,7 +561,7 @@ class ReturnAction {
GTEST_CHECK_(!performed_)
<< "A ByMove() action should only be performed once.";
performed_ = true;
return move(wrapper_->payload);
return internal::move(wrapper_->payload);
}
private: