From f0b7631e3a6238533f56f3882980f7ce2c895979 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 15 Jun 2006 03:15:41 +0000 Subject: [PATCH] use standard name "isfinite", not "finite" --- stepmania/src/PlayerOptions.cpp | 4 ++-- stepmania/src/RageUtil.cpp | 4 ++-- stepmania/src/StreamDisplay.cpp | 2 +- stepmania/src/archutils/Win32/arch_setup.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index 7e96d1404a..1ea62c2cce 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -258,7 +258,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid ) else if( *s[0]=='*' ) { sscanf( *s, "*%f", &speed ); - if( !finite(speed) ) + if( !isfinite(speed) ) speed = 1.0f; } } @@ -280,7 +280,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid ) } else if( sscanf( sBit, "c%f", &level ) == 1 ) { - if( !finite(level) || level <= 0.0f ) + if( !isfinite(level) || level <= 0.0f ) level = 200.0f; // Just pick some value. SET_FLOAT( fScrollBPM ) SET_FLOAT( fTimeSpacing ) diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index de700e7af8..768f18e31c 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -1478,7 +1478,7 @@ float StringToFloat( const RString &sString ) { float ret = strtof( sString, NULL ); - if( !finite(ret) ) + if( !isfinite(ret) ) ret = 0.0f; return ret; } @@ -1907,7 +1907,7 @@ bool FromString( const RString &sValue, float &out ) { const char *endptr = sValue.data() + sValue.size(); out = strtof( sValue, (char **) &endptr ); - return endptr != sValue.data() && finite( out ); + return endptr != sValue.data() && isfinite( out ); } bool FromString( const RString &sValue, bool &out ) diff --git a/stepmania/src/StreamDisplay.cpp b/stepmania/src/StreamDisplay.cpp index 87aa75c71b..8a264fc490 100644 --- a/stepmania/src/StreamDisplay.cpp +++ b/stepmania/src/StreamDisplay.cpp @@ -134,7 +134,7 @@ void StreamDisplay::SetPercent( float fPercent ) DEBUG_ASSERT_M( 0, "fPercent is NaN" ); fPercent = 1; } - if( !finite(fPercent) ) + if( !isfinite(fPercent) ) { DEBUG_ASSERT_M( 0, "fPercent is infinite" ); fPercent = 1; diff --git a/stepmania/src/archutils/Win32/arch_setup.h b/stepmania/src/archutils/Win32/arch_setup.h index 211e5e0f5a..33cd13087e 100644 --- a/stepmania/src/archutils/Win32/arch_setup.h +++ b/stepmania/src/archutils/Win32/arch_setup.h @@ -56,7 +56,7 @@ inline const T& min(const T &a, const T &b, P Pr) { return Pr(b, a)? b:a; } #define lstat stat #define fsync _commit #define isnan _isnan -#define finite _finite +#define isfinite _finite /* mkdir is missing the mode arg */ #define mkdir(p,m) mkdir(p)