diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-02-23 23:37:29 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-02-23 23:37:29 +0000 |
| commit | 652540a278e56528e576f9ea77515f386698a326 (patch) | |
| tree | a1eec03b5f17ae6336af2355ef9e6f05520e8786 /include/gmock/gmock-actions.h | |
| parent | 1bee7b2f1dbf491fd8a3ee49e791a2aa324d86c7 (diff) | |
| download | googletest-652540a278e56528e576f9ea77515f386698a326.tar.gz googletest-652540a278e56528e576f9ea77515f386698a326.tar.bz2 googletest-652540a278e56528e576f9ea77515f386698a326.zip | |
Cleans up macro definitions.
Diffstat (limited to 'include/gmock/gmock-actions.h')
| -rw-r--r-- | include/gmock/gmock-actions.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<N>(args)); -#ifdef GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS #pragma warning(pop) // Restores the warning state. #endif // GTEST_OS_WINDOWS } |