diff options
| author | Herbert Thielen <h-github@thielen-home.de> | 2017-08-30 10:44:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 10:44:26 +0200 |
| commit | d6562b5a57ec908274d6702ddb0a5ff5b925e02d (patch) | |
| tree | dc278f01b97a87d40990cab8a424ab511bb3b6cb /googlemock/include/gmock/gmock.h | |
| parent | b567aadd1b3eeccdb85305cdb65664f0245e90bc (diff) | |
| parent | 71e2858f32902ca736e2dc8d81b512a4dfa18b80 (diff) | |
| download | googletest-d6562b5a57ec908274d6702ddb0a5ff5b925e02d.tar.gz googletest-d6562b5a57ec908274d6702ddb0a5ff5b925e02d.tar.bz2 googletest-d6562b5a57ec908274d6702ddb0a5ff5b925e02d.zip | |
Merge branch 'master' into hethi/unused-import
Diffstat (limited to 'googlemock/include/gmock/gmock.h')
| -rw-r--r-- | googlemock/include/gmock/gmock.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 |