aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock.h
diff options
context:
space:
mode:
authorScott Slack-Smith <deenderah@gmail.com>2017-11-24 16:00:56 +0000
committerScott Slack-Smith <deenderah@gmail.com>2017-11-24 16:00:56 +0000
commit6c093a2391eb66a42bd4146443265eddad06be0c (patch)
treeb61e233a023b5c5a43c31520fd6b84f5a4b37788 /googlemock/include/gmock/gmock.h
parentc958e26fd02d43a916ff297c89eee22166fe7be7 (diff)
parentd175c8bf823e709d570772b038757fadf63bc632 (diff)
downloadgoogletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.gz
googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.bz2
googletest-6c093a2391eb66a42bd4146443265eddad06be0c.zip
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googlemock/include/gmock/gmock.h')
-rw-r--r--googlemock/include/gmock/gmock.h1
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