Merge pull request #611 from Tilka/clang_bug

VideoCommon: version-check clang for workaround
2014-07-13 17:52:54 -07:00 · 2014-07-13 17:52:54 -07:00 · 3f67ec0d50
parent 5c701f6e82 b6f3ae23bc
commit 3f67ec0d50
1 changed files with 1 additions and 1 deletions
--- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@ -28,7 +28,7 @@

 // This avoids a harmless warning from a system header in Clang;
 // see http://llvm.org/bugs/show_bug.cgi?id=16093
-#ifdef __clang__
+#ifdef __clang__ && __clang_major__ * 100 + __clang_minor__ <= 304
 #pragma clang diagnostic ignored "-Wshadow"
 #endif