From acbd901f3a27a9d38fe902a4d278d06725f70c80 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 15 Mar 2022 11:47:50 -0700 Subject: [PATCH] Fix build warning -Wimplicit-fallthrough when using clang in C++14 mode --- DirectXTex/DirectXTexConvert.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index 3660177..13df775 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -3265,10 +3265,10 @@ void DirectX::Internal::ConvertScanline( #if (__cplusplus >= 201703L) [[fallthrough]]; -#elif defined(_MSC_VER) - __fallthrough; #elif defined(__clang__) [[clang::fallthrough]]; +#elif defined(_MSC_VER) + __fallthrough; #endif case TEX_FILTER_RGB_COPY_RED: @@ -3555,10 +3555,10 @@ void DirectX::Internal::ConvertScanline( #if (__cplusplus >= 201703L) [[fallthrough]]; -#elif defined(_MSC_VER) - __fallthrough; #elif defined(__clang__) [[clang::fallthrough]]; +#elif defined(_MSC_VER) + __fallthrough; #endif case TEX_FILTER_RGB_COPY_RED: @@ -3654,10 +3654,10 @@ void DirectX::Internal::ConvertScanline( #if (__cplusplus >= 201703L) [[fallthrough]]; -#elif defined(_MSC_VER) - __fallthrough; #elif defined(__clang__) [[clang::fallthrough]]; +#elif defined(_MSC_VER) + __fallthrough; #endif case TEX_FILTER_RGB_COPY_RED: