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

Timestamp:

Mar 12, 2012, 2:57:07 AM (10 years ago)

Author:

sam

Message:

math: minor tweak to avoid using macros with empty parameters.

File:

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

trunk/src/lol/math/vector.h

@@ -954 +954 @@
 #define DECLARE_VECTOR_VECTOR_COERCE_OP(tname, op, tprefix, t1, t2, tf) \
     tprefix \
-    static inline tname<tf> operator op(tname<t1> const &a, \
-                                        tname<t2> const &b) \
+    inline tname<tf> operator op(tname<t1> const &a, tname<t2> const &b) \
     { \
         tname<tf> ret; \
@@ -965 +964 @@
 #define DECLARE_VECTOR_VECTOR_OP(tname, op, tprefix, type) \
     tprefix \
-    static inline tname<type> operator op##=(tname<type> &a, \
-                                             tname<type> const &b) \
+    inline tname<type> operator op##=(tname<type> &a, tname<type> const &b) \
     { \
         return a = a op b; \
@@ -973 +971 @@
 #define DECLARE_VECTOR_VECTOR_BOOLOP(tname, op, op2, ret, tprefix, t1, t2) \
     tprefix \
-    static inline bool operator op(tname<t1> const &a, \
-                                   tname<t2> const &b) \
+    inline bool operator op(tname<t1> const &a, tname<t2> const &b) \
     { \
         for (size_t n = 0; n < sizeof(a) / sizeof(t1); n++) \
@@ -984 +981 @@
 #define DECLARE_VECTOR_SCALAR_COERCE_OP(tname, op, tprefix, t1, t2, tf) \
     tprefix \
-    static inline tname<tf> operator op(tname<t1> const &a, t2 const &val) \
+    inline tname<tf> operator op(tname<t1> const &a, t2 const &val) \
     { \
         tname<tf> ret; \
@@ -993 +990 @@
     \
     tprefix \
-    static inline tname<tf> operator op(t1 const &val, tname<t2> const &a) \
+    inline tname<tf> operator op(t1 const &val, tname<t2> const &a) \
     { \
         tname<tf> ret; \
@@ -1003 +1000 @@
 #define DECLARE_VECTOR_SCALAR_OP(tname, op, tprefix, type) \
     tprefix \
-    static inline tname<type> operator op##=(tname<type> &a, type const &val) \
+    inline tname<type> operator op##=(tname<type> &a, type const &val) \
     { \
         return a = a op val; \
@@ -1010 +1007 @@
 #define DECLARE_UNARY_OPS(tname, tprefix, type) \
     tprefix \
-    static inline tname<type> operator -(tname<type> const &a) \
+    inline tname<type> operator -(tname<type> const &a) \
     { \
         tname<type> ret; \
@@ -1019 +1016 @@
     \
     tprefix \
-    static inline type sqlen(tname<type> const &a) \
+    inline type sqlen(tname<type> const &a) \
     { \
         type acc = 0; \
@@ -1028 +1025 @@
     \
     tprefix \
-    static inline double len(tname<type> const &a) \
+    inline double len(tname<type> const &a) \
     { \
         using namespace std; \
@@ -1035 +1032 @@
     \
     tprefix \
-    static inline tname<type> normalize(tname<type> const &val) \
+    inline tname<type> normalize(tname<type> const &val) \
     { \
         type norm = (type)len(val); \
@@ -1052 +1049 @@
     \
     tprefix \
-    static inline tf dot(tname<t1> const &a, tname<t2> const &b) \
+    inline tf dot(tname<t1> const &a, tname<t2> const &b) \
     { \
         tf ret = 0; \
@@ -1079 +1076 @@
 
 #define DECLARE_VECTOR_OPS(tname, tprefix, type) \
-    DECLARE_VECTOR_COERCE_OPS(tname, /* empty */, type, type, type) \
+    DECLARE_VECTOR_COERCE_OPS(tname, static, type, type, type) \
     \
     DECLARE_VECTOR_VECTOR_OP(tname, *, tprefix, type) \
@@ -1085 +1082 @@
 
 #define DECLARE_ALL_NONVECTOR_OPS(tname) \
-    DECLARE_BINARY_OPS(tname, template<typename T>, T) \
-    DECLARE_UNARY_OPS(tname, template<typename T>, T)
+    DECLARE_BINARY_OPS(tname, template<typename T> static, T) \
+    DECLARE_UNARY_OPS(tname, template<typename T> static, T)
 
 #define DECLARE_ALL_VECTOR_OPS_INNER(tname, type) \
-    DECLARE_BINARY_OPS(tname, /* empty */, type) \
-    DECLARE_UNARY_OPS(tname, /* empty */, type) \
-    DECLARE_VECTOR_OPS(tname, /* empty */, type) \
+    DECLARE_BINARY_OPS(tname, static, type) \
+    DECLARE_UNARY_OPS(tname, static, type) \
+    DECLARE_VECTOR_OPS(tname, static, type) \
 
 #define DECLARE_ALL_VECTOR_OPS(tname) \
@@ -1107 +1104 @@
 
 #define DECLARE_ALL_VECTOR_COERCE_OPS_INNER(tname, tlow, thigh) \
-    DECLARE_BINARY_COERCE_OPS(tname, /* empty */, tlow, thigh, thigh) \
-    DECLARE_BINARY_COERCE_OPS(tname, /* empty */, thigh, tlow, thigh) \
-    \
-    DECLARE_VECTOR_COERCE_OPS(tname, /* empty */, tlow, thigh, thigh) \
-    DECLARE_VECTOR_COERCE_OPS(tname, /* empty */, thigh, tlow, thigh)
+    DECLARE_BINARY_COERCE_OPS(tname, static, tlow, thigh, thigh) \
+    DECLARE_BINARY_COERCE_OPS(tname, static, thigh, tlow, thigh) \
+    \
+    DECLARE_VECTOR_COERCE_OPS(tname, static, tlow, thigh, thigh) \
+    DECLARE_VECTOR_COERCE_OPS(tname, static, thigh, tlow, thigh)
 
 #define DECLARE_ALL_VECTOR_COERCE_OPS(tname) \