diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-01 00:05:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 00:05:22 -0400 |
| commit | ee53b281ba16f5402e3a42003414a68d336fcd94 (patch) | |
| tree | 2e629c5674eb80d2090aca0c27f8388d5b4801da /googlemock/include/gmock/gmock.h | |
| parent | ca76206f4268a009427afa96dfd792012db64583 (diff) | |
| parent | 69e794ca75e6c07ad78a8f7467c267be9ac08921 (diff) | |
| download | googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.gz googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.bz2 googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.zip | |
Merge branch 'master' into user_logger_instead_of_printf
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 |