diff options
| author | Che-Hsun Liu <chehsunliu@gmail.com> | 2017-08-31 19:02:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 19:02:12 +0800 |
| commit | 3eaba9f07c5f81a8b83432e4ae389ee42337393f (patch) | |
| tree | 948d6ccdcf5a59ec1310cf81817ea2042236bbb9 /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | 24696c3958f0be6a87b52f07436417c53d0fef24 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.gz googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.bz2 googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 39f72129..96802444 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 |