Merge pull request #611 from Tilka/clang_bug

VideoCommon: version-check clang for workaround
dolphin-emu · Jul 14, 2014 · 3f67ec0 · 3f67ec0
2 parents 5c701f6 + b6f3ae2
commit 3f67ec0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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