Skip to content

Commit 7f5d8e6

Browse files
committed
Fix some deprecated copy ops in google mock
1 parent 0a34ff8 commit 7f5d8e6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,10 @@ class ActionHelper {
657657
public:\
658658
explicit GMOCK_ACTION_CLASS_(name, value_params)\
659659
GMOCK_INTERNAL_INIT_##value_params {}\
660+
GMOCK_ACTION_CLASS_(name, value_params)(\
661+
const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept = default;\
662+
GMOCK_ACTION_CLASS_(name, value_params)(\
663+
GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept = default;\
660664
template <typename F>\
661665
class gmock_Impl : public ::testing::ActionInterface<F> {\
662666
public:\
@@ -688,8 +692,6 @@ class ActionHelper {
688692
new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
689693
}\
690694
GMOCK_INTERNAL_DEFN_##value_params\
691-
private:\
692-
GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
693695
};\
694696
template <GMOCK_INTERNAL_DECL_##template_params\
695697
GMOCK_INTERNAL_DECL_TYPE_##value_params>\

llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,8 +1297,6 @@ class MockSpec {
12971297
internal::FunctionMocker<F>* const function_mocker_;
12981298
// The argument matchers specified in the spec.
12991299
ArgumentMatcherTuple matchers_;
1300-
1301-
GTEST_DISALLOW_ASSIGN_(MockSpec);
13021300
}; // class MockSpec
13031301

13041302
// Wrapper type for generically holding an ordinary value or lvalue reference.

0 commit comments

Comments
 (0)