Changeset 845 for code/branches/core/src/util/Math.h

Timestamp:

Mar 1, 2008, 9:29:23 PM (16 years ago)

Author:

landauf

Message:

(1) removed ExportClass and ExportAbstractClass macros
(2) removed _UtilExport from templates

reto, i hope (2) removed some of your compiler errors and orxonox works still on your system with (1)

File:

• code/branches/core/src/util/Math.h (modified) (11 diffs)

code/branches/core/src/util/Math.h

@@ -59 +59 @@
 
 template <typename T>
-inline _UtilExport T sgn(T x)
+inline T sgn(T x)
 {
     return (x >= 0) ? 1 : -1;
@@ -65 +65 @@
 
 template <typename T>
-inline _UtilExport T min(T a, T b)
+inline T min(T a, T b)
 {
     return (a <= b) ? a : b;
@@ -71 +71 @@
 
 template <typename T>
-inline _UtilExport T max(T a, T b)
+inline T max(T a, T b)
 {
     return (a >= b) ? a : b;
@@ -77 +77 @@
 
 template <typename T>
-inline _UtilExport T clamp(T x, T min, T max)
+inline T clamp(T x, T min, T max)
 {
     if (x < min)
@@ -89 +89 @@
 
 template <typename T>
-inline _UtilExport T square(T x)
+inline T square(T x)
 {
     return x*x;
@@ -95 +95 @@
 
 template <typename T>
-inline _UtilExport T cube(T x)
+inline T cube(T x)
 {
     return x*x*x;
@@ -101 +101 @@
 
 template <typename T>
-inline _UtilExport int floor(T x)
+inline int floor(T x)
 {
     return (int)(x);
@@ -107 +107 @@
 
 template <typename T>
-inline _UtilExport int ceil(T x)
+inline int ceil(T x)
 {
     int temp = floor(x);
@@ -114 +114 @@
 
 template <typename T>
-inline _UtilExport int round(T x)
+inline int round(T x)
 {
     return (int)(x + 0.5);
@@ -120 +120 @@
 
 template <typename T>
-_UtilExport T interpolate(float time, const T& start, const T& end)
+T interpolate(float time, const T& start, const T& end)
 {
     return time * (end - start) + start;
@@ -126 +126 @@
 
 template <typename T>
-_UtilExport T interpolateSmooth(float time, const T& start, const T& end)
+T interpolateSmooth(float time, const T& start, const T& end)
 {
     return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;