diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-02 10:54:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 10:54:26 -0500 |
| commit | fa6730103ecaad750f42700c55a92c3e212a9271 (patch) | |
| tree | 3c9e1638dc96dfe918b73e87d4b389d3bbe5dd86 /googlemock/include/gmock/gmock.h | |
| parent | ca6a70c6082ff526b993c622d192c6d519800bc2 (diff) | |
| parent | 1c2f1907047216654599b0057df49d21a2c1400a (diff) | |
| download | googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.gz googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.bz2 googletest-fa6730103ecaad750f42700c55a92c3e212a9271.zip | |
Merge branch 'master' into uintptr
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 |