diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h index 2944137a728..86c3a02596b 100644 --- a/AK/StdLibExtras.h +++ b/AK/StdLibExtras.h @@ -6,15 +6,9 @@ #pragma once -#include - -#if defined(AK_COMPILER_CLANG) -# pragma clang diagnostic ignored "-Wunqualified-std-cast-call" -#endif - -#include - #include +#include +#include #include diff --git a/Meta/CMake/common_compile_options.cmake b/Meta/CMake/common_compile_options.cmake index 41f52b3dbb2..223a341df32 100644 --- a/Meta/CMake/common_compile_options.cmake +++ b/Meta/CMake/common_compile_options.cmake @@ -81,6 +81,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_SIMULATE_ID MATCHES add_cxx_compile_options(-Wno-implicit-const-int-float-conversion) add_cxx_compile_options(-Wno-user-defined-literals) add_cxx_compile_options(-Wno-vla-cxx-extension) + add_cxx_compile_options(-Wno-unqualified-std-cast-call) elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # Only ignore expansion-to-defined for g++, clang's implementation doesn't complain about function-like macros add_cxx_compile_options(-Wno-expansion-to-defined) @@ -91,6 +92,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang$" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC") add_cxx_compile_options(-Wno-reserved-identifier) add_cxx_compile_options(-Wno-user-defined-literals) + add_cxx_compile_options(-Wno-unqualified-std-cast-call) add_definitions(-D_CRT_SECURE_NO_WARNINGS) # TODO: this seems wrong, but we use this kind of code too much