aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock.h
diff options
context:
space:
mode:
authorChe-Hsun Liu <chehsunliu@gmail.com>2017-08-31 19:02:12 +0800
committerGitHub <noreply@github.com>2017-08-31 19:02:12 +0800
commit3eaba9f07c5f81a8b83432e4ae389ee42337393f (patch)
tree948d6ccdcf5a59ec1310cf81817ea2042236bbb9 /googlemock/include/gmock/gmock.h
parent24696c3958f0be6a87b52f07436417c53d0fef24 (diff)
parent16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff)
downloadgoogletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.gz
googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.bz2
googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.zip
Merge branch 'master' into master
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