From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 19 Feb 2009 05:34:25 +0000 (+0000)
Subject: fix for IBM xlC 8, it can't parse the template syntax
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/be4674271d0150c44f1c3f268a9cd7c39c6fc3e6?ds=sidebyside

fix for IBM xlC 8, it can't parse the template syntax

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/private/flagscheck.h b/include/wx/private/flagscheck.h
index 751278eedf..22d2fce7ad 100644
--- a/include/wx/private/flagscheck.h
+++ b/include/wx/private/flagscheck.h
@@ -12,6 +12,10 @@
 #define _WX_PRIVATE_FLAGSCHECK_H_
 
 #include "wx/debug.h"
+
+// IBM xlC 8 can't parse the template syntax
+#if !defined(__IBMCPP__)
+
 #include "wx/meta/if.h"
 
 namespace wxPrivate
@@ -36,7 +40,7 @@ namespace wxPrivate
 //
 // NB: If any of this doesn't compile with your compiler and would be too
 //     hard to make work, it's probably best to disable this code and replace
-//     the macros below with empty stubs, this isn't anything criticial.
+//     the macros below with empty stubs, this isn't anything critical.
 
 template<int val> struct FlagsHaveConflictingValues
 {
@@ -101,6 +105,10 @@ template<int all, int add> struct SafelyAddToMask
 #define wxADD_FLAG(f, others) \
     ::wxPrivate::SafelyAddToMask<f, others>::value
 
+#else
+    #define wxADD_FLAG(f, others) (f | others)
+#endif
+
 // Checks if flags value 'f' is within the mask of allowed values
 #define wxASSERT_VALID_FLAGS(f, mask)                   \
     wxASSERT_MSG( (f & mask) == f,                      \