Changeset 1381Tweet

Timestamp:

May 13, 2012, 10:14:42 PM (11 years ago)

Author:

sam

Message:

core: some clang and g++ 4.7 compilation fixes.

Location:

trunk/src

Files:

• array.h (modified) (7 diffs)
• lol/math/real.h (modified) (1 diff)
• lol/math/vector.h (modified) (2 diffs)

trunk/src/array.h

@@ -271 +271 @@
             T1 tmp1 = m1; T2 tmp2 = m2; T3 tmp3 = m3; T4 tmp4 = m4;
             T5 tmp5 = m5; T6 tmp6 = m6; T7 tmp7 = m7; T8 tmp8 = m8;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;
@@ -310 +310 @@
             T1 tmp1 = m1; T2 tmp2 = m2; T3 tmp3 = m3; T4 tmp4 = m4;
             T5 tmp5 = m5; T6 tmp6 = m6; T7 tmp7 = m7;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;
@@ -347 +347 @@
             T1 tmp1 = m1; T2 tmp2 = m2; T3 tmp3 = m3; T4 tmp4 = m4;
             T5 tmp5 = m5; T6 tmp6 = m6;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;
@@ -381 +381 @@
             T1 tmp1 = m1; T2 tmp2 = m2; T3 tmp3 = m3; T4 tmp4 = m4;
             T5 tmp5 = m5;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;
@@ -411 +411 @@
         {
             T1 tmp1 = m1; T2 tmp2 = m2; T3 tmp3 = m3; T4 tmp4 = m4;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;
@@ -439 +439 @@
         {
             T1 tmp1 = m1; T2 tmp2 = m2; T3 tmp3 = m3;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;
@@ -465 +465 @@
         {
             T1 tmp1 = m1; T2 tmp2 = m2;
-            Reserve(this->m_count * 13 / 8 + 8);
+            this->Reserve(this->m_count * 13 / 8 + 8);
             this->m_data[this->m_count].m1 = tmp1;
             this->m_data[this->m_count].m2 = tmp2;

trunk/src/lol/math/real.h

@@ -277 +277 @@
 template<> void real::print(int ndigits) const;
 
+template<> real const real::R_0;
+template<> real const real::R_1;
+template<> real const real::R_2;
+template<> real const real::R_3;
+template<> real const real::R_10;
+
+template<> real const real::R_LN2;
+template<> real const real::R_LN10;
+template<> real const real::R_LOG2E;
+template<> real const real::R_LOG10E;
+template<> real const real::R_E;
+template<> real const real::R_PI;
+template<> real const real::R_PI_2;
+template<> real const real::R_PI_3;
+template<> real const real::R_PI_4;
+template<> real const real::R_1_PI;
+template<> real const real::R_2_PI;
+template<> real const real::R_2_SQRTPI;
+template<> real const real::R_SQRT2;
+template<> real const real::R_SQRT3;
+template<> real const real::R_SQRT1_2;
+
 } /* namespace lol */
 

trunk/src/lol/math/vector.h

@@ -965 +965 @@
     static Quat<T> fromeuler_zyx(T phi, T theta, T psi);
 
-    inline Quat<T> operator *(Quat<T> const &val) const
-    {
-        Quat<T> ret;
-        Vec3<T> v1(x, y, z);
-        Vec3<T> v2(val.x, val.y, val.z);
-        Vec3<T> v3 = cross(v1, v2) + w * v2 + val.w * v1;
-        return Quat<T>(w * val.w - dot(v1, v2), v3.x, v3.y, v3.z);
-    }
+    inline Quat<T> operator *(Quat<T> const &val) const;
 
     inline Quat<T> operator *=(Quat<T> const &val)
@@ -1522 +1515 @@
 #undef DECLARE_ALL_VECTOR_OPS_INNER
 #undef DECLARE_ALL_VECTOR_OPS
+
+/*
+ * Definition of additional functions requiring vector functions
+ */
+
+template<typename T>
+inline Quat<T> Quat<T>::operator *(Quat<T> const &val) const
+{
+    Quat<T> ret;
+    Vec3<T> v1(x, y, z);
+    Vec3<T> v2(val.x, val.y, val.z);
+    Vec3<T> v3 = cross(v1, v2) + w * v2 + val.w * v1;
+    return Quat<T>(w * val.w - dot(v1, v2), v3.x, v3.y, v3.z);
+}
 
 /*