gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "#ifdef GTEST_OS_..." instead of "#if GTEST_OS_..."

Browse Source 
This is compatible with compiling with "-Wundef" (#3267).

PiperOrigin-RevId: 513943378
Change-Id: I47cf5fabbb77be061c4483a0adc54511af6b191c
This commit is contained in:
Tom Hughes
2023-03-03 15:54:32 -08:00
committed by Copybara-Service
parent cead3d57c9
commit 23142843f7
27 changed files with 305 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/gmock-nice-strict.h
View File

@@ -98,7 +98,7 @@ constexpr bool HasStrictnessModifier() {
// deregistration. This guarantees that MockClass's constructor and destructor
// run with the same level of strictness as its instance methods.
#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW && \
#if defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_WINDOWS_MINGW) && \
(defined(_MSC_VER) || defined(__clang__))
// We need to mark these classes with this declspec to ensure that
// the empty base class optimization is performed.