Changeset 9077 for code/branches/testing/src/libraries/util/Math.h

Timestamp:

Apr 1, 2012, 6:48:06 PM (12 years ago)

Author:

landauf

Message:

reverted changes of r9020 in LibraryConfig.cmake
fixed warning in Math.h
added include directories for tests
fixed runtime path in CTestCustom.cmake

File:

• code/branches/testing/src/libraries/util/Math.h (modified) (2 diffs)

code/branches/testing/src/libraries/util/Math.h

@@ -238 +238 @@
     inline T interpolate(float time, const T& start, const T& end)
     {
-        return time * (end - start) + start;
+        return static_cast<T>(time * (end - start) + start);
     }
 
@@ -251 +251 @@
     inline T interpolateSmooth(float time, const T& start, const T& end)
     {
-        return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;
+        return static_cast<T>((-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start);
     }