diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-29 10:19:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 10:19:33 -0400 |
| commit | 30c1e00afbc083618abd745362c41d41a5ac61d0 (patch) | |
| tree | c41fd687365f6dec68d98061caf6aa52a374c6f6 /googlemock/include | |
| parent | fe760e9c6d92f55c04c000ae65df2336ede42eea (diff) | |
| parent | 96f3745e73d5541419617006e9571b572a098f91 (diff) | |
| download | googletest-30c1e00afbc083618abd745362c41d41a5ac61d0.tar.gz googletest-30c1e00afbc083618abd745362c41d41a5ac61d0.tar.bz2 googletest-30c1e00afbc083618abd745362c41d41a5ac61d0.zip | |
Merge branch 'master' into hethi/typo-xUnit
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 1 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock.h | 1 |
2 files changed, 1 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 diff --git a/googlemock/include/gmock/gmock.h b/googlemock/include/gmock/gmock.h index 6735c71b..5764bc85 100644 --- a/googlemock/include/gmock/gmock.h +++ b/googlemock/include/gmock/gmock.h @@ -71,6 +71,7 @@ namespace testing { // Declares Google Mock flags that we want a user to use programmatically. GMOCK_DECLARE_bool_(catch_leaked_mocks); GMOCK_DECLARE_string_(verbose); +GMOCK_DECLARE_int32_(default_mock_behavior); // Initializes Google Mock. This must be called before running the // tests. In particular, it parses the command line for the flags |