summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-matchers-containers_test.cc
diff options
context:
space:
mode:
authorDerek Mauro <dmauro@google.com>2022-04-22 18:25:26 (GMT)
committerCopybara-Service <copybara-worker@google.com>2022-04-22 18:26:03 (GMT)
commitbf66935e07825318ae519675d73d0f3e313b3ec6 (patch)
treed23875e66696f765c265fc1a1df5a594490507e0 /googlemock/test/gmock-matchers-containers_test.cc
parentb85864c64758dec007208e56af933fc3f52044ee (diff)
downloadgoogletest-bf66935e07825318ae519675d73d0f3e313b3ec6.zip
googletest-bf66935e07825318ae519675d73d0f3e313b3ec6.tar.gz
googletest-bf66935e07825318ae519675d73d0f3e313b3ec6.tar.bz2
Remove the legacy internal GTEST_DISALLOW_* macros
PiperOrigin-RevId: 443715444 Change-Id: I3ffd54b63d2728ae4a668ee7875c8c3c8188087c
Diffstat (limited to 'googlemock/test/gmock-matchers-containers_test.cc')
-rw-r--r--googlemock/test/gmock-matchers-containers_test.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/googlemock/test/gmock-matchers-containers_test.cc b/googlemock/test/gmock-matchers-containers_test.cc
index 74a226d..be74dd7 100644
--- a/googlemock/test/gmock-matchers-containers_test.cc
+++ b/googlemock/test/gmock-matchers-containers_test.cc
@@ -342,7 +342,8 @@ class Uncopyable {
private:
int value_;
- GTEST_DISALLOW_COPY_AND_ASSIGN_(Uncopyable);
+ Uncopyable(const Uncopyable&) = delete;
+ Uncopyable& operator=(const Uncopyable&) = delete;
};
// Returns true if and only if x.value() is positive.
@@ -2764,7 +2765,10 @@ class NativeArrayPassedAsPointerAndSize {
MOCK_METHOD(void, Helper, (int* array, int size));
private:
- GTEST_DISALLOW_COPY_AND_ASSIGN_(NativeArrayPassedAsPointerAndSize);
+ NativeArrayPassedAsPointerAndSize(const NativeArrayPassedAsPointerAndSize&) =
+ delete;
+ NativeArrayPassedAsPointerAndSize& operator=(
+ const NativeArrayPassedAsPointerAndSize&) = delete;
};
TEST(ElementsAreTest, WorksWithNativeArrayPassedAsPointerAndSize) {