[llvm] 7f5d8e6 - Fix some deprecated copy ops in google mock

[David Blaikie via llvm-commits]

Author: David Blaikie
Date: 2021-05-16T15:59:06-07:00
New Revision: 7f5d8e655965c0347c2a05f65e63dec4490a9fa0

URL: https://github.com/llvm/llvm-project/commit/7f5d8e655965c0347c2a05f65e63dec4490a9fa0
DIFF: https://github.com/llvm/llvm-project/commit/7f5d8e655965c0347c2a05f65e63dec4490a9fa0.diff

LOG: Fix some deprecated copy ops in google mock

Added: 
    

Modified: 
    llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
    llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h

Removed: 
    


################################################################################
diff  --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
index 9b5b78b165b61..c538dce8d2726 100644
--- a/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
@@ -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>\

diff  --git a/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h b/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
index 7df6c87a4c307..4fc4a546ef272 100644
--- a/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
+++ b/llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
@@ -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.