Changeset 1154 for trunk/src/lol/math/vector.hTweet

Timestamp:

Mar 6, 2012, 8:11:19 PM (10 years ago)

Author:

sam

Message:

math: disable const union members on GCC prior to 4.6.

File:

• trunk/src/lol/math/vector.h (modified) (7 diffs)

trunk/src/lol/math/vector.h

@@ -28 +28 @@
 namespace lol
 {
+
+/* Some compilers do not support const members in anonymous unions. So
+ * far, GCC (>= 4.6), CLang (3.0) and Visual Studio (>= 2010) appear to
+ * work properly. */
+#undef LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
+#   define LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS 1
+#endif
 
 #define DECLARE_VECTOR_TYPEDEFS(tname, suffix) \
@@ -129 +137 @@
         struct { T s, t; };
 
+#if LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#   define const /* disabled */
+#endif
         XVec2<T,0x00> const xx, rr, ss;
         XVec2<T,0x01> const xy, rg, st; /* lvalue */
@@ -159 +170 @@
         XVec4<T,0x1110> const yyyx, gggr, ttts;
         XVec4<T,0x1111> const yyyy, gggg, tttt;
+#if LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#   undef const
+#endif
     };
 };
@@ -288 +302 @@
         struct { T s, t, p; };
 
+#if LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#   define const /* disabled */
+#endif
         XVec2<T,0x00> const xx, rr, ss;
         XVec2<T,0x01> const xy, rg, st; /* lvalue */
@@ -407 +424 @@
         XVec4<T,0x2221> const zzzy, bbbg, pppt;
         XVec4<T,0x2222> const zzzz, bbbb, pppp;
+#if LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#   undef const
+#endif
     };
 };
@@ -469 +489 @@
         struct { T s, t, p, q; };
 
+#if LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#   define const /* disabled */
+#endif
         XVec2<T,0x00> const xx, rr, ss;
         XVec2<T,0x01> const xy, rg, st; /* lvalue */
@@ -807 +830 @@
         XVec4<T,0x3332> const wwwz, aaab, qqqp;
         XVec4<T,0x3333> const wwww, aaaa, qqqq;
+#if LOL_NO_CONST_MEMBERS_IN_ANONYMOUS_UNIONS
+#   undef const
+#endif
     };
 };