From 2fe8d1f9a0ccdf3c95684db2493a36cd3e78f58f Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 6 Feb 2012 15:48:05 +0000 Subject: [PATCH] math: fix a syntax error in vector.h due to duplicate macro declaration. --- src/lol/math/vector.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lol/math/vector.h b/src/lol/math/vector.h index 3561997c..c3c8c7e4 100644 --- a/src/lol/math/vector.h +++ b/src/lol/math/vector.h @@ -910,7 +910,7 @@ static inline Quat operator /(Quat x, Quat const &y) return ret; \ } -#define DECLARE_ALL_GLOBAL_OPS(tname, tprefix, T) \ +#define DECLARE_OTHER_GLOBAL_OPS(tname, tprefix, T) \ DECLARE_SCALAR_OP(tname, *, tprefix, T) \ DECLARE_SCALAR_OP(tname, /, tprefix, T) \ \ @@ -962,13 +962,13 @@ static inline Quat operator /(Quat x, Quat const &y) } #define DECLARE_GLOBAL_TEMPLATE_OPS(tname) \ - DECLARE_ALL_GLOBAL_OPS(tname, template, T) + DECLARE_OTHER_GLOBAL_OPS(tname, template, T) #define DECLARE_ALL_GLOBAL_OPS(tname, tprefix, T) \ DECLARE_VECTOR_OP(tname, *, tprefix, T) \ DECLARE_VECTOR_OP(tname, /, tprefix, T) \ \ - DECLARE_ALL_GLOBAL_OPS(tname, tprefix, T) \ + DECLARE_OTHER_GLOBAL_OPS(tname, tprefix, T) \ \ DECLARE_BOOL_OP(tname, <=, <=, true, tprefix, T) \ DECLARE_BOOL_OP(tname, >=, >=, true, tprefix, T) \ @@ -1002,7 +1002,7 @@ DECLARE_GLOBAL_TYPED_OPS(Vec4) #undef DECLARE_VECTOR_OP #undef DECLARE_BOOL_OP #undef DECLARE_SCALAR_OP -#undef DECLARE_ALL_GLOBAL_OPS +#undef DECLARE_GLOBAL_OPS #undef DECLARE_GLOBAL_TEMPLATE_OPS #undef DECLARE_ALL_GLOBAL_OPS #undef DECLARE_GLOBAL_TYPED_OPS