diff options
| author | Josh Bodily <joshbodily@gmail.com> | 2017-12-12 17:36:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 17:36:37 (GMT) |
| commit | 3e2cb75446e0f56f226f0fb259e032bb4d014002 (patch) | |
| tree | 4d945ff84ee3affb3187acb1fbb8ba9d300718d8 /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | cf85f56b2159d7c964dacb3e311163a6f9520688 (diff) | |
| parent | 0fe96607d85cf3a25ac40da369db62bbee2939a5 (diff) | |
| download | googletest-3e2cb75446e0f56f226f0fb259e032bb4d014002.zip googletest-3e2cb75446e0f56f226f0fb259e032bb4d014002.tar.gz googletest-3e2cb75446e0f56f226f0fb259e032bb4d014002.tar.bz2 | |
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 39f7212..a8347bd 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -363,7 +363,6 @@ enum CallReaction { kAllow, kWarn, kFail, - kDefault = kWarn // By default, warn about uninteresting calls. }; } // namespace internal @@ -1775,7 +1774,7 @@ class FunctionMockerBase : public UntypedFunctionMockerBase { // There is no generally useful and implementable semantics of // copying a mock object, so copying a mock is usually a user error. // Thus we disallow copying function mockers. If the user really - // wants to copy a mock object, he should implement his own copy + // wants to copy a mock object, they should implement their own copy // operation, for example: // // class MockFoo : public Foo { |