[Csp-commits] svn:csp r1383 - trunk/CSP/CSPSim/Include/Systems

[<sv...@ww...>]

Author: delta
Date: 2004-12-15 01:12:50 -0800 (Wed, 15 Dec 2004)
New Revision: 1383

Modified:
   trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h
Log:
* Added std:: scope in front of double abs(double) to avoid confusion with the c function int abs(int).

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1383

Modified: trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h
===================================================================
--- trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h	2004-12-15 03:48:58 UTC (rev 1382)
+++ trunk/CSP/CSPSim/Include/Systems/AircraftSimpleFCS.h	2004-12-15 09:12:50 UTC (rev 1383)
@@ -65,7 +65,7 @@
 		}
 		// experiment a poor flatting function
 		virtual double flat(double x) const {
-			double abs_x = abs(x);
+			double abs_x = std::abs(x);
 			double scale = x*x*(3.0 - 2.0*abs_x);
 			return scale * x;
 		}