diff options
| author | Tom Hughes <tomhughes@google.com> | 2023-03-03 23:54:32 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-06 15:14:21 (GMT) |
| commit | 23142843f7c875907a6ed7985174a6e346e82c3d (patch) | |
| tree | 27fada6ccf3be641ec3ec564887750cf6df98d70 /googlemock/include/gmock/gmock-nice-strict.h | |
| parent | cead3d57c93ff8c4e5c1bbae57a5c0b0b0f6e168 (diff) | |
| download | googletest-23142843f7c875907a6ed7985174a6e346e82c3d.zip googletest-23142843f7c875907a6ed7985174a6e346e82c3d.tar.gz googletest-23142843f7c875907a6ed7985174a6e346e82c3d.tar.bz2 | |
Use "#ifdef GTEST_OS_..." instead of "#if GTEST_OS_..."
This is compatible with compiling with "-Wundef" (#3267).
PiperOrigin-RevId: 513943378
Change-Id: I47cf5fabbb77be061c4483a0adc54511af6b191c
Diffstat (limited to 'googlemock/include/gmock/gmock-nice-strict.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-nice-strict.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-nice-strict.h b/googlemock/include/gmock/gmock-nice-strict.h index 4f0eb35..056d471 100644 --- a/googlemock/include/gmock/gmock-nice-strict.h +++ b/googlemock/include/gmock/gmock-nice-strict.h @@ -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. |