Investigate the suppression of warnings

YexuanXiao · web-flow · commit 90a70cbd80ef · 2026-02-22T21:52:16.000+08:00
diff --git a/cppwinrt/component_writers.h b/cppwinrt/component_writers.h
@@ -175,7 +175,7 @@ void* __stdcall %_get_activation_factory([[maybe_unused]] std::wstring_view cons
 std::int32_t __stdcall WINRT_CanUnloadNow() noexcept
 {
 #ifdef _WRL_MODULE_H_
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 4324) // structure was padded due to alignment specifier
 #endif
     if (!::Microsoft::WRL::Module<::Microsoft::WRL::InProc>::GetModule().Terminate())
diff --git a/strings/base_activation.h b/strings/base_activation.h
@@ -185,7 +185,7 @@ namespace winrt::impl
 
 #ifdef _WIN64
     inline constexpr std::uint32_t memory_allocation_alignment{ 16 };
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
 #pragma warning(disable:4324) // structure was padded due to alignment specifier
 #endif
@@ -208,7 +208,7 @@ namespace winrt::impl
             std::uint64_t reserved4 : 60;
         } reserved2;
     };
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
 #endif
 #else
diff --git a/strings/base_composable.h b/strings/base_composable.h
@@ -4,7 +4,7 @@ namespace winrt::impl
     template <typename D>
     struct composable_factory
     {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
 #pragma warning(disable: 4702) // Compiler bug causing spurious "unreachable code" warnings
 #endif
@@ -15,7 +15,7 @@ namespace winrt::impl
             inner = CreateInstanceImpl(outer, std::forward<Args>(args)...);
             return inner.as<I>();
         }
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
 #endif
 
diff --git a/strings/base_delegate.h b/strings/base_delegate.h
@@ -1,7 +1,7 @@
 
 namespace winrt::impl
 {
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
 #pragma warning(disable:4458) // declaration hides class member (okay because we do not use named members of base class)
 #endif
@@ -215,7 +215,7 @@ namespace winrt::impl
         }
     };
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
 #endif
 }
diff --git a/strings/base_events.h b/strings/base_events.h
@@ -331,7 +331,7 @@ namespace winrt::impl
     com_ptr<event_array<T>> make_event_array(std::uint32_t const capacity)
     {
         void* raw = ::operator new(sizeof(event_array<T>) + (sizeof(T)* capacity));
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 6386)
 #endif
         return { new(raw) event_array<T>(capacity), take_ownership_from_abi };
diff --git a/strings/base_identity.h b/strings/base_identity.h
@@ -453,14 +453,14 @@ namespace winrt::impl
     template <typename T>
     struct pinterface_guid
     {
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 4307)
 #endif
         static constexpr guid value{ generate_guid(signature<T>::data) };
     };
 
     template <typename T>
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 4307)
 #endif
     inline constexpr auto name_v
diff --git a/strings/base_implements.h b/strings/base_implements.h
@@ -361,7 +361,7 @@ namespace winrt::impl
     template <typename ... T>
     struct uncloaked_iids<interface_list<T...>>
     {
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 4307)
 #endif
         static constexpr std::array<guid, sizeof...(T)> value{ winrt::guid_of<T>() ... };
@@ -1390,7 +1390,7 @@ namespace winrt::impl
 
 WINRT_EXPORT namespace winrt
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
 #pragma warning(disable: 4702) // Compiler bug causing spurious "unreachable code" warnings
 #endif
@@ -1447,7 +1447,7 @@ WINRT_EXPORT namespace winrt
             return { impl::create_and_initialize<D>(std::forward<Args>(args)...), take_ownership_from_abi };
         }
     }
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
 #endif
 
diff --git a/strings/base_macros.h b/strings/base_macros.h
@@ -15,7 +15,7 @@
 
 #define WINRT_IMPL_SHIM(...) (*(abi_t<__VA_ARGS__>**)&static_cast<__VA_ARGS__ const&>(static_cast<D const&>(*this)))
 
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 // Note: this is a workaround for a false-positive warning produced by the Visual C++ 15.9 compiler.
 #pragma warning(disable : 5046)
 
diff --git a/strings/base_string_input.h b/strings/base_string_input.h
@@ -3,15 +3,15 @@ WINRT_EXPORT namespace winrt::param
 {
     struct hstring
     {
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 26495)
 #endif
         hstring() noexcept : m_handle(nullptr) {}
         hstring(hstring const& values) = delete;
         hstring& operator=(hstring const& values) = delete;
         hstring(std::nullptr_t) = delete;
 
-#ifdef _MSC_VER
+#ifdef _MSC_VER // T
 #pragma warning(suppress: 26495)
 #endif
         hstring(winrt::hstring const& value) noexcept : m_handle(get_abi(value))
diff --git a/test/catch.hpp b/test/catch.hpp
@@ -1543,7 +1543,7 @@ inline id performOptionalSelector( id obj, SEL sel ) {
 // end catch_objc_arc.hpp
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
 #pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
 #endif
@@ -2181,14 +2181,14 @@ namespace Catch { \
 
 #define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
 #endif
 
 // end catch_tostring.h
 #include <iosfwd>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
 #pragma warning(disable:4389) // '==' : signed/unsigned mismatch
 #pragma warning(disable:4018) // more "signed/unsigned mismatch"
@@ -2424,7 +2424,7 @@ namespace Catch {
 
 } // end namespace Catch
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
 #endif
 
diff --git a/test/old_tests/Component/pch.h b/test/old_tests/Component/pch.h
@@ -1,6 +1,6 @@
 ﻿#pragma once
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable:4100)
 #endif
 
diff --git a/test/old_tests/Composable/precomp.hpp b/test/old_tests/Composable/precomp.hpp
@@ -1,6 +1,6 @@
 ﻿#pragma once
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable:4100)
 #endif
 
diff --git a/test/old_tests/UnitTests/Errors.cpp b/test/old_tests/UnitTests/Errors.cpp
@@ -66,7 +66,7 @@ void test_exception(HRESULT const code, std::wstring_view message)
     }
 }
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable: 4702)  // unreachable code
 #endif
 TEST_CASE("Errors")
diff --git a/test/old_tests/UnitTests/IReference.cpp b/test/old_tests/UnitTests/IReference.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 #include "catch.hpp"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable:4471) // a forward declaration of an unscoped enumeration must have an underlying type
 #endif
 #include <windows.foundation.h>
diff --git a/test/old_tests/UnitTests/constexpr.cpp b/test/old_tests/UnitTests/constexpr.cpp
@@ -2,7 +2,7 @@
 #include "catch.hpp"
 #include "string_view_compare.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable:4471) // a forward declaration of an unscoped enumeration must have an underlying type
 #endif
 #include <Windows.Applicationmodel.Activation.h>
diff --git a/test/old_tests/UnitTests/enum_flags.cpp b/test/old_tests/UnitTests/enum_flags.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 #include "catch.hpp"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable:4471) // a forward declaration of an unscoped enumeration must have an underlying type
 #endif
 #include <Windows.ApplicationModel.Appointments.h>
diff --git a/test/old_tests/UnitTests/hresult_error.cpp b/test/old_tests/UnitTests/hresult_error.cpp
@@ -482,7 +482,7 @@ TEST_CASE("hresult, exception")
     }
 }
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable: 4702)  // unreachable code
 #endif
 TEST_CASE("hresult, throw_last_error")
diff --git a/test/old_tests/UnitTests/meta.cpp b/test/old_tests/UnitTests/meta.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 #include "catch.hpp"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(disable: 4505)
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ void* __stdcall %_get_activation_factory([[maybe_unused]] std::wstring_view cons`
`175`	`175`	`std::int32_t __stdcall WINRT_CanUnloadNow() noexcept`
`176`	`176`	`{`
`177`	`177`	`#ifdef _WRL_MODULE_H_`
`178`		`-#ifdef _MSC_VER`
	`178`	`+#ifdef _MSC_VER // T`
`179`	`179`	`#pragma warning(suppress: 4324) // structure was padded due to alignment specifier`
`180`	`180`	`#endif`
`181`	`181`	`if (!::Microsoft::WRL::Module<::Microsoft::WRL::InProc>::GetModule().Terminate())`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`namespace winrt::impl`
`3`	`3`	`{`
`4`		`-#if defined(_MSC_VER)`
	`4`	`+#if defined(_MSC_VER) && !defined(__clang__)`
`5`	`5`	`#pragma warning(push)`
`6`	`6`	`#pragma warning(disable:4458) // declaration hides class member (okay because we do not use named members of base class)`
`7`	`7`	`#endif`
`@@ -215,7 +215,7 @@ namespace winrt::impl`
`215`	`215`	`}`
`216`	`216`	`};`
`217`	`217`
`218`		`-#if defined(_MSC_VER)`
	`218`	`+#if defined(_MSC_VER) && !defined(__clang__)`
`219`	`219`	`#pragma warning(pop)`
`220`	`220`	`#endif`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ namespace winrt::impl`
`331`	`331`	`com_ptr<event_array<T>> make_event_array(std::uint32_t const capacity)`
`332`	`332`	`{`
`333`	`333`	`void* raw = ::operator new(sizeof(event_array<T>) + (sizeof(T)* capacity));`
`334`		`-#ifdef _MSC_VER`
	`334`	`+#ifdef _MSC_VER // T`
`335`	`335`	`#pragma warning(suppress: 6386)`
`336`	`336`	`#endif`
`337`	`337`	`return { new(raw) event_array<T>(capacity), take_ownership_from_abi };`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ namespace winrt::impl`
`361`	`361`	`template <typename ... T>`
`362`	`362`	`struct uncloaked_iids<interface_list<T...>>`
`363`	`363`	`{`
`364`		`-#ifdef _MSC_VER`
	`364`	`+#ifdef _MSC_VER // T`
`365`	`365`	`#pragma warning(suppress: 4307)`
`366`	`366`	`#endif`
`367`	`367`	`static constexpr std::array<guid, sizeof...(T)> value{ winrt::guid_of<T>() ... };`
`@@ -1390,7 +1390,7 @@ namespace winrt::impl`
`1390`	`1390`
`1391`	`1391`	`WINRT_EXPORT namespace winrt`
`1392`	`1392`	`{`
`1393`		`-#ifdef _MSC_VER`
	`1393`	`+#if defined(_MSC_VER) && !defined(__clang__)`
`1394`	`1394`	`#pragma warning(push)`
`1395`	`1395`	`#pragma warning(disable: 4702) // Compiler bug causing spurious "unreachable code" warnings`
`1396`	`1396`	`#endif`
`@@ -1447,7 +1447,7 @@ WINRT_EXPORT namespace winrt`
`1447`	`1447`	`return { impl::create_and_initialize<D>(std::forward<Args>(args)...), take_ownership_from_abi };`
`1448`	`1448`	`}`
`1449`	`1449`	`}`
`1450`		`-#ifdef _MSC_VER`
	`1450`	`+#if defined(_MSC_VER) && !defined(__clang__)`
`1451`	`1451`	`#pragma warning(pop)`
`1452`	`1452`	`#endif`
`1453`	`1453`