From 9c2293af064504f1a7296a2397211be8809452d9 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 8 Feb 2021 19:00:11 -0500 Subject: Googletest export Fix build for MinGW + clang In [1], empty_bases "is only supported when using the Microsoft C++ ABI." Disable it for MinGW. https://clang.llvm.org/docs/AttributeReference.html#empty-bases PiperOrigin-RevId: 356373782 --- googlemock/include/gmock/gmock-nice-strict.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/googlemock/include/gmock/gmock-nice-strict.h b/googlemock/include/gmock/gmock-nice-strict.h index 75c51dd..bf02092 100644 --- a/googlemock/include/gmock/gmock-nice-strict.h +++ b/googlemock/include/gmock/gmock-nice-strict.h @@ -97,7 +97,8 @@ 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 && (defined(_MSC_VER) || defined(__clang__)) +#if GTEST_OS_WINDOWS && !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. #define GTEST_INTERNAL_EMPTY_BASE_CLASS __declspec(empty_bases) -- cgit v0.12