From 6bbf911a8dc0c42ad05135f26a07f4893eb83916 Mon Sep 17 00:00:00 2001 From: Jonathan Wendeborn Date: Tue, 16 Oct 2018 08:19:02 +0200 Subject: Don't fully qualify enum member --- googlemock/src/gmock-spec-builders.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'googlemock/src') diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 0813a974..408623da 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -710,11 +710,9 @@ bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj) namespace { // checks whether the specified mock_obj has a registered call reaction bool HasCallReaction(void* mock_obj, internal::CallReaction reaction) { - using internal::CallReaction; - const auto found = g_uninteresting_call_reaction.find(mock_obj); if (found == g_uninteresting_call_reaction.cend()) { - return internal::CallReaction::kDefault == reaction; + return internal::kDefault == reaction; } return found->second == reaction; } @@ -723,17 +721,17 @@ bool HasCallReaction(void* mock_obj, internal::CallReaction reaction) { bool Mock::IsNaggy(void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { internal::MutexLock l(&internal::g_gmock_mutex); - return HasCallReaction(mock_obj, internal::CallReaction::kWarn); + return HasCallReaction(mock_obj, internal::kWarn); } bool Mock::IsNice(void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { internal::MutexLock l(&internal::g_gmock_mutex); - return HasCallReaction(mock_obj, internal::CallReaction::kAllow); + return HasCallReaction(mock_obj, internal::kAllow); } bool Mock::IsStrict(void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { internal::MutexLock l(&internal::g_gmock_mutex); - return HasCallReaction(mock_obj, internal::CallReaction::kFail); + return HasCallReaction(mock_obj, internal::kFail); } // Registers a mock object and a mock method it owns. -- cgit v1.2.3