diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-04 10:47:11 +0300 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-04 10:47:11 +0300 |
commit | 13fc186922e7018d2afc39d474f760e35c8a8a97 (patch) | |
tree | f20690bf748776be2e3b0d2b325db457cf11eb45 /extern/bullet2/src/LinearMath/btMinMax.h | |
parent | 24a9a0f135edc912094fe48a854572ba1f4954e0 (diff) | |
parent | abd4934d1aeceafaa2fc242f00db0ba53a7e24db (diff) |
Nasty merge from trunk's r18216.
Diffstat (limited to 'extern/bullet2/src/LinearMath/btMinMax.h')
-rw-r--r-- | extern/bullet2/src/LinearMath/btMinMax.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extern/bullet2/src/LinearMath/btMinMax.h b/extern/bullet2/src/LinearMath/btMinMax.h index 1b8a3633f38..5e27d62a4a4 100644 --- a/extern/bullet2/src/LinearMath/btMinMax.h +++ b/extern/bullet2/src/LinearMath/btMinMax.h @@ -18,15 +18,15 @@ subject to the following restrictions: #define GEN_MINMAX_H template <class T> -SIMD_FORCE_INLINE const T& GEN_min(const T& a, const T& b) +SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) { - return b < a ? b : a; + return a < b ? a : b ; } template <class T> -SIMD_FORCE_INLINE const T& GEN_max(const T& a, const T& b) +SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b) { - return a < b ? b : a; + return a > b ? a : b; } template <class T> @@ -36,7 +36,7 @@ SIMD_FORCE_INLINE const T& GEN_clamped(const T& a, const T& lb, const T& ub) } template <class T> -SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b) +SIMD_FORCE_INLINE void btSetMin(T& a, const T& b) { if (b < a) { @@ -45,7 +45,7 @@ SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b) } template <class T> -SIMD_FORCE_INLINE void GEN_set_max(T& a, const T& b) +SIMD_FORCE_INLINE void btSetMax(T& a, const T& b) { if (a < b) { |