From 89f2265f170f27627869107cce2629f4eb5040a8 Mon Sep 17 00:00:00 2001 From: Yesudeep Mangalapilly Date: Thu, 23 Jun 2022 13:36:16 -0700 Subject: [PATCH 1/3] Address a missing declaration warning to improve signal --- googlemock/src/gmock-spec-builders.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 658ad3fa..0d7e2371 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -68,6 +68,8 @@ namespace internal { // mockers, and all expectations. GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex); +CallReaction intToCallReaction(int mock_behavior); + // Logs a message including file and line number information. GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity, const char* file, int line, From cb3852b403be6d5beae3c3caee3ea38a46cf85d4 Mon Sep 17 00:00:00 2001 From: Yesudeep Mangalapilly Date: Mon, 27 Jun 2022 13:04:53 -0700 Subject: [PATCH 2/3] Mark intToCallReaction static --- googlemock/src/gmock-spec-builders.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 0d7e2371..783c3124 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -68,8 +68,6 @@ namespace internal { // mockers, and all expectations. GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex); -CallReaction intToCallReaction(int mock_behavior); - // Logs a message including file and line number information. GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity, const char* file, int line, @@ -437,7 +435,7 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked() return expectations_met; } -CallReaction intToCallReaction(int mock_behavior) { +static CallReaction intToCallReaction(int mock_behavior) { if (mock_behavior >= kAllow && mock_behavior <= kFail) { return static_cast(mock_behavior); } From c94e2d28f141d8f67606aed11157b30d84ab8769 Mon Sep 17 00:00:00 2001 From: Yesudeep Mangalapilly Date: Mon, 27 Jun 2022 13:09:57 -0700 Subject: [PATCH 3/3] Move intToCallReaction to anonymous namespace. --- googlemock/src/gmock-spec-builders.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 783c3124..db27f49e 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -435,13 +435,6 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked() return expectations_met; } -static CallReaction intToCallReaction(int mock_behavior) { - if (mock_behavior >= kAllow && mock_behavior <= kFail) { - return static_cast(mock_behavior); - } - return kWarn; -} - } // namespace internal // Class Mock. @@ -533,6 +526,13 @@ class MockObjectRegistry { // Protected by g_gmock_mutex. MockObjectRegistry g_mock_object_registry; +static internal::CallReaction intToCallReaction(int mock_behavior) { + if (mock_behavior >= internal::kAllow && mock_behavior <= internal::kFail) { + return static_cast(mock_behavior); + } + return internal::kWarn; +} + // Maps a mock object to the reaction Google Mock should have when an // uninteresting method is called. Protected by g_gmock_mutex. std::unordered_map& @@ -588,8 +588,7 @@ internal::CallReaction Mock::GetReactionOnUninterestingCalls( internal::MutexLock l(&internal::g_gmock_mutex); return (UninterestingCallReactionMap().count( reinterpret_cast(mock_obj)) == 0) - ? internal::intToCallReaction( - GMOCK_FLAG_GET(default_mock_behavior)) + ? intToCallReaction(GMOCK_FLAG_GET(default_mock_behavior)) : UninterestingCallReactionMap()[reinterpret_cast( mock_obj)]; }