SG_ namespace.

[simgear.git] / simgear / inlines.h

diff --git a/simgear/inlines.h b/simgear/inlines.h
index 817a255dd6a41df5f6638b226875b3f07cba25a0..e3aae3c3b2a00b55b362ab4e0d4765fbcd8ad411 100644 (file)
--- a/simgear/inlines.h
+++ b/simgear/inlines.h
@@ -4,19 +4,20 @@
 //
 // Copyright (C) 2000  Norman Vine  - nhv@cape.com
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA  02111-1307, USA.
 //
 // $Id$
 
@@ -31,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));
 }
 
 //