[OMPT-svn-commit] SF.net SVN: modplug:[2179] trunk/OpenMPT/soundlib

[<man...@us...>]

Revision: 2179
          http://sourceforge.net/p/modplug/code/2179
Author:   manxorist
Date:     2013-05-23 18:10:04 +0000 (Thu, 23 May 2013)
Log Message:
-----------
[Ref] GCC before 4.6 does not have pragma diagnostic push. Fix the warning.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/MIDIMacros.cpp
    trunk/OpenMPT/soundlib/SampleIO.cpp

Modified: trunk/OpenMPT/soundlib/MIDIMacros.cpp
===================================================================
--- trunk/OpenMPT/soundlib/MIDIMacros.cpp	2013-05-23 14:52:10 UTC (rev 2178)
+++ trunk/OpenMPT/soundlib/MIDIMacros.cpp	2013-05-23 18:10:04 UTC (rev 2179)
@@ -74,7 +74,9 @@
 
 
 #if MPT_COMPILER_GCC
+#if MPT_GCC_AT_LEAST(4,6,0)
 #pragma GCC diagnostic push
+#endif
 #pragma GCC diagnostic ignored "-Wswitch"
 #elif MPT_COMPILER_CLANG
 #pragma clang diagnostic push
@@ -117,14 +119,18 @@
 }
 
 #if MPT_COMPILER_GCC
+#if MPT_GCC_AT_LEAST(4,6,0)
 #pragma GCC diagnostic pop
+#endif
 #elif MPT_COMPILER_CLANG
 #pragma clang diagnostic pop
 #endif
 
 
 #if MPT_COMPILER_GCC
+#if MPT_GCC_AT_LEAST(4,6,0)
 #pragma GCC diagnostic push
+#endif
 #pragma GCC diagnostic ignored "-Wswitch"
 #elif MPT_COMPILER_CLANG
 #pragma clang diagnostic push
@@ -185,7 +191,9 @@
 }
 
 #if MPT_COMPILER_GCC
+#if MPT_GCC_AT_LEAST(4,6,0)
 #pragma GCC diagnostic pop
+#endif
 #elif MPT_COMPILER_CLANG
 #pragma clang diagnostic pop
 #endif

Modified: trunk/OpenMPT/soundlib/SampleIO.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleIO.cpp	2013-05-23 14:52:10 UTC (rev 2178)
+++ trunk/OpenMPT/soundlib/SampleIO.cpp	2013-05-23 18:10:04 UTC (rev 2179)
@@ -24,7 +24,9 @@
 
 
 #if MPT_COMPILER_GCC
+#if MPT_GCC_AT_LEAST(4,6,0)
 #pragma GCC diagnostic push
+#endif
 #pragma GCC diagnostic ignored "-Wswitch"
 #elif MPT_COMPILER_CLANG
 #pragma clang diagnostic push
@@ -401,7 +403,9 @@
 }
 
 #if MPT_COMPILER_GCC
+#if MPT_GCC_AT_LEAST(4,6,0)
 #pragma GCC diagnostic pop
+#endif
 #elif MPT_COMPILER_CLANG
 #pragma clang diagnostic pop
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.