From 652540a278e56528e576f9ea77515f386698a326 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Mon, 23 Feb 2009 23:37:29 +0000 Subject: Cleans up macro definitions. --- include/gmock/gmock-actions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/gmock/gmock-actions.h') diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index 7aa5274c..823054bf 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -678,12 +678,12 @@ class SetArrayArgumentAction { // Microsoft compiler deprecates ::std::copy, so we want to suppress warning // 4996 (Function call with parameters that may be unsafe) there. -#ifdef GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS #pragma warning(push) // Saves the current warning state. #pragma warning(disable:4996) // Temporarily disables warning 4996. #endif // GTEST_OS_WINDOWS ::std::copy(first_, last_, ::std::tr1::get(args)); -#ifdef GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS #pragma warning(pop) // Restores the warning state. #endif // GTEST_OS_WINDOWS } -- cgit v1.2.3