Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(577)

Unified Diff: testing/gmock/include/gmock/gmock-generated-nice-strict.h.pump

Issue 521012: Update gmock and gtest. (Closed)
Patch Set: update readme Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: testing/gmock/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/testing/gmock/include/gmock/gmock-generated-nice-strict.h.pump b/testing/gmock/include/gmock/gmock-generated-nice-strict.h.pump
index b265c2e4a6c0c169af0c87c4243f81990bd5066a..96371f57bd083592ba316ff183aa271c176986fd 100644
--- a/testing/gmock/include/gmock/gmock-generated-nice-strict.h.pump
+++ b/testing/gmock/include/gmock/gmock-generated-nice-strict.h.pump
@@ -100,6 +100,9 @@ $range j 1..i
::testing::Mock::UnregisterCallReaction(
internal::implicit_cast<MockClass*>(this));
}
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
};
template <class MockClass>
@@ -132,6 +135,9 @@ $range j 1..i
::testing::Mock::UnregisterCallReaction(
internal::implicit_cast<MockClass*>(this));
}
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
};
// The following specializations catch some (relatively more common)
« no previous file with comments | « testing/gmock/include/gmock/gmock-generated-nice-strict.h ('k') | testing/gmock/include/gmock/gmock-matchers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698