diff options
| author | Alyssa Wilk <alyssar@chromium.org> | 2017-08-10 13:41:09 (GMT) |
|---|---|---|
| committer | Alyssa Wilk <alyssar@chromium.org> | 2017-08-10 13:41:09 (GMT) |
| commit | 6e1970e2376c14bf658eb88f655a054030353f9f (patch) | |
| tree | d8803debb6882160b43ef253a5b6033972d9c6d2 /googlemock/src/gmock-spec-builders.cc | |
| parent | b322d1d91d92b2e38513f0fc86de9e93314d8006 (diff) | |
| download | googletest-6e1970e2376c14bf658eb88f655a054030353f9f.zip googletest-6e1970e2376c14bf658eb88f655a054030353f9f.tar.gz googletest-6e1970e2376c14bf658eb88f655a054030353f9f.tar.bz2 | |
Adding a flag option to change the default mock type
Diffstat (limited to 'googlemock/src/gmock-spec-builders.cc')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 2fa1ee4..1fc8d98 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -648,7 +648,8 @@ internal::CallReaction Mock::GetReactionOnUninterestingCalls( GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { internal::MutexLock l(&internal::g_gmock_mutex); return (g_uninteresting_call_reaction.count(mock_obj) == 0) ? - internal::kDefault : g_uninteresting_call_reaction[mock_obj]; + static_cast<internal::CallReaction>(GMOCK_FLAG(default_mock_behavior)) : + g_uninteresting_call_reaction[mock_obj]; } // Tells Google Mock to ignore mock_obj when checking for leaked mock |