diff options
| author | Scott Slack-Smith <deenderah@gmail.com> | 2017-11-24 16:00:56 +0000 |
|---|---|---|
| committer | Scott Slack-Smith <deenderah@gmail.com> | 2017-11-24 16:00:56 +0000 |
| commit | 6c093a2391eb66a42bd4146443265eddad06be0c (patch) | |
| tree | b61e233a023b5c5a43c31520fd6b84f5a4b37788 /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | c958e26fd02d43a916ff297c89eee22166fe7be7 (diff) | |
| parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
| download | googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.gz googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.bz2 googletest-6c093a2391eb66a42bd4146443265eddad06be0c.zip | |
Merge branch 'master' of https://github.com/google/googletest
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 39f72129..a8347bd8 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 { |