diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-06 14:29:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-06 14:29:25 -0400 |
commit | 8b491162f79282b79292e0f4166194b3f7ccb7b1 (patch) | |
tree | b6e5d65fcf25c9353d110820cad4a1ab7e1be353 /googlemock/include/gmock/gmock.h | |
parent | a1c332cdbe89ea3b0be9ea5bef18aefe835d7ee1 (diff) | |
parent | 8a3ccc3ee36342c149a696b3c0e5ba9d4938efa9 (diff) | |
download | googletest-8b491162f79282b79292e0f4166194b3f7ccb7b1.tar.gz googletest-8b491162f79282b79292e0f4166194b3f7ccb7b1.tar.bz2 googletest-8b491162f79282b79292e0f4166194b3f7ccb7b1.zip |
Merge branch 'master' into support_xboxone
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 |