From b1345fb165c4297c4f3327912d3985f5dc3d4377 Mon Sep 17 00:00:00 2001 From: Chlumsky Date: Thu, 18 Jan 2024 16:57:59 +0100 Subject: [PATCH] Fixed MSVC Clang compatibility --- all-in-one/generate.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/all-in-one/generate.py b/all-in-one/generate.py index 1976270..6010544 100644 --- a/all-in-one/generate.py +++ b/all-in-one/generate.py @@ -84,12 +84,12 @@ source = """ #endif #endif -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4456 4457 4458 6246) -#elif defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4456 4457 4458 6246) #endif #ifndef M_PI @@ -98,10 +98,10 @@ source = """ """ sourceAppendix = """ -#ifdef _MSC_VER -#pragma warning(pop) -#elif defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning(pop) #endif """