diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2017-09-06 01:05:24 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2017-09-06 01:05:24 +0100 |
| commit | 78b1ff074799c776f90a77203fcd7adc98e11736 (patch) | |
| tree | 21974f2d4f0d4aeaff5a4027df84889a2619ae25 /googlemock/include/gmock/gmock.h | |
| parent | a838de3348add7530431e8d91c8a66cc646f1888 (diff) | |
| parent | 857ddeadebe4aa75efcee728651d0947a5a1065a (diff) | |
| download | googletest-78b1ff074799c776f90a77203fcd7adc98e11736.tar.gz googletest-78b1ff074799c776f90a77203fcd7adc98e11736.tar.bz2 googletest-78b1ff074799c776f90a77203fcd7adc98e11736.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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 |