SG_ namespace.

[simgear.git] / simgear / inlines.h

diff --git a/simgear/inlines.h b/simgear/inlines.h
index 8cf00c1d7048513a3e4d3b275054b344eedba5eb..e3aae3c3b2a00b55b362ab4e0d4765fbcd8ad411 100644 (file)
--- a/simgear/inlines.h
+++ b/simgear/inlines.h
@@ -32,25 +32,25 @@ inline const int SG_SIGN(const T x) {
 }
 
 template <class T>
-inline const T SG_MIN(const T a, const T b) {
+inline const T SG_MIN2(const T a, const T b) {
     return a < b ? a : b;
 }
 
 // return the minimum of three values
 template <class T>
 inline const T SG_MIN3( const T a, const T b, const T c) {
-    return (a < b ? SG_MIN (a, c) : SG_MIN (b, c));
+    return (a < b ? SG_MIN2 (a, c) : SG_MIN2 (b, c));
 }
 
 template <class T>
-inline const T SG_MAX(const T a, const T b) {
+inline const T SG_MAX2(const T a, const T b) {
     return  a > b ? a : b;
 }
 
 // return the maximum of three values
 template <class T>
 inline const T SG_MAX3 (const T a, const T b, const T c) {
-    return (a > b ? SG_MAX (a, c) : SG_MAX (b, c));
+    return (a > b ? SG_MAX2 (a, c) : SG_MAX2 (b, c));
 }
 
 //