diff options
Diffstat (limited to 'include/gmock/gmock-spec-builders.h')
-rw-r--r-- | include/gmock/gmock-spec-builders.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 63655b91..61e140e4 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -1302,15 +1302,12 @@ template <typename T> class ReferenceOrValueWrapper { public: // Constructs a wrapper from the given value/reference. - explicit ReferenceOrValueWrapper(T value) - : value_(GTEST_MOVE_(value)) {} + explicit ReferenceOrValueWrapper(T value) : value_(move(value)) {} // Unwraps and returns the underlying value/reference, exactly as // originally passed. The behavior of calling this more than once on // the same object is unspecified. - T Unwrap() { - return GTEST_MOVE_(value_); - } + T Unwrap() { return move(value_); } // Provides nondestructive access to the underlying value/reference. // Always returns a const reference (more precisely, @@ -1407,8 +1404,7 @@ class ActionResultHolder : public UntypedActionResultHolderBase { private: typedef ReferenceOrValueWrapper<T> Wrapper; - explicit ActionResultHolder(Wrapper result) - : result_(GTEST_MOVE_(result)) {} + explicit ActionResultHolder(Wrapper result) : result_(move(result)) {} Wrapper result_; |