1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00

Fix some deprecated copy ops in google mock

This commit is contained in:
David Blaikie 2021-05-16 15:58:40 -07:00
parent 05a02f8da8
commit 2cfbc27b4f
2 changed files with 4 additions and 4 deletions

View File

@ -657,6 +657,10 @@ class ActionHelper {
public:\
explicit GMOCK_ACTION_CLASS_(name, value_params)\
GMOCK_INTERNAL_INIT_##value_params {}\
GMOCK_ACTION_CLASS_(name, value_params)(\
const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept = default;\
GMOCK_ACTION_CLASS_(name, value_params)(\
GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept = default;\
template <typename F>\
class gmock_Impl : public ::testing::ActionInterface<F> {\
public:\
@ -688,8 +692,6 @@ class ActionHelper {
new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
}\
GMOCK_INTERNAL_DEFN_##value_params\
private:\
GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
};\
template <GMOCK_INTERNAL_DECL_##template_params\
GMOCK_INTERNAL_DECL_TYPE_##value_params>\

View File

@ -1297,8 +1297,6 @@ class MockSpec {
internal::FunctionMocker<F>* const function_mocker_;
// The argument matchers specified in the spec.
ArgumentMatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(MockSpec);
}; // class MockSpec
// Wrapper type for generically holding an ordinary value or lvalue reference.