summaryrefslogtreecommitdiffstats
path: root/googlemock/include
diff options
context:
space:
mode:
authorBrian <bsilver16384@gmail.com>2022-01-06 05:33:05 (GMT)
committerBrian <bsilver16384@gmail.com>2022-01-06 05:33:05 (GMT)
commit58b71c9ea2fa52a7412e2267895d016abe14a971 (patch)
tree0dd470eb94ededa3d9ca80b67080dc2dfc7282f5 /googlemock/include
parent6b74da4757a549563d7c37c8fae3e704662a043b (diff)
downloadgoogletest-58b71c9ea2fa52a7412e2267895d016abe14a971.zip
googletest-58b71c9ea2fa52a7412e2267895d016abe14a971.tar.gz
googletest-58b71c9ea2fa52a7412e2267895d016abe14a971.tar.bz2
Remove another GTEST_DISALLOW_ASSIGN_ that crept inrefs/pull/3725/head
They were all removed in #2815, but it looks like this one got added from a Google export which missed the update. See #2815 for reasons why removing this is desirable.
Diffstat (limited to 'googlemock/include')
-rw-r--r--googlemock/include/gmock/gmock-matchers.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index 2f846ba..e92577a 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -1462,8 +1462,6 @@ class ConditionalMatcher {
bool condition_;
MatcherTrue matcher_true_;
MatcherFalse matcher_false_;
-
- GTEST_DISALLOW_ASSIGN_(ConditionalMatcher);
};
// Wrapper for implementation of Any/AllOfArray().