github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Functions4U: Improved NAN handling

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10583 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2016-12-25 16:12:40 +00:00
parent ba7931a291
commit 28cbd2c033
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bazaar/Functions4U/Functions4U.cpp
View file

@ -2583,6 +2583,7 @@ int SysX(const char *cmd, String& out, String& err, double timeOut,
return IsNull(ret) ? 0 : ret;
}
END_UPP_NAMESPACE
// Dummy functions added after TheIDE change

20
bazaar/Functions4U/Functions4U.h
View file

@ -4,7 +4,7 @@
#include <float.h>
#include <Draw/Draw.h>
#ifdef flagGUI
#include <ide/Browser/Browser.h>
///#include <ide/Browser/Browser.h>
#include <Web/Web.h>
#include "GatherTpp.h"
#endif
@ -251,7 +251,15 @@ inline T BetweenVal(const T& val, const T& _min, const T& _max) {
return max(_min, min(_max, val));
}
#define IsNan(a) ((a) != (a))
template <class T>
inline bool IsNAN(T val) {return std::isnan(val);}
template <class T>
inline T FixFloat(T val) {
if(std::isnan(val) || std::isinf(val) || val == HUGE_VAL || val == -HUGE_VAL)
return Null;
return val;
}
template <class T>
T AngleAdd360(T ang, T val) {
@ -431,10 +439,10 @@ public:
}
return ret;
}
double GetDouble(String separators = "") {return atof(GetText(separators));};
int GetInt(String separators = "") {return atoi(GetText(separators));};
long GetLong(String separators = "") {return atol(GetText(separators));};
uint64 GetUInt64(String separators = "") {return atoll(GetText(separators));};
double GetDouble(String separators = "") {return FixFloat(atof(GetText(separators)));};
int GetInt(String separators = "") {return int(FixFloat(atof(GetText(separators))));};
long GetLong(String separators = "") {return long(FixFloat(atof(GetText(separators))));};
uint64 GetUInt64(String separators = "") {return (uint64)(FixFloat(atof(GetText(separators))));};
String Right() {return String::Mid(pos+1);}
int GetLastSeparator() {return lastSeparator;}