From: <sv...@ww...> - 2004-06-28 17:39:50
|
Author: delta Date: 2004-06-28 10:39:44 -0700 (Mon, 28 Jun 2004) New Revision: 1091 Modified: trunk/CSP/SimData/Source/Interpolate.cpp Log: Changed macros min/max to STL ones. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1091 Modified: trunk/CSP/SimData/Source/Interpolate.cpp =================================================================== --- trunk/CSP/SimData/Source/Interpolate.cpp 2004-06-28 17:27:43 UTC (rev 1090) +++ trunk/CSP/SimData/Source/Interpolate.cpp 2004-06-28 17:39:44 UTC (rev 1091) @@ -26,8 +26,8 @@ NAMESPACE_SIMDATA -#define min(a, b) (((a)<(b)) ? (a) : (b)) -#define max(a, b) (((a)>(b)) ? (a) : (b)) +using std::min; +using std::max; template <typename T> const Enumeration InterpolatedData<T>::Method("LINEAR SPLINE"); |