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

Odstraneni IsNan a IsInf z TCore (pridano do Core)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6908 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2014-02-11 07:10:16 +00:00
parent 3e0eea0098
commit d143cd6502
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/TCore/CalcType.cpp
View file

@ -71,7 +71,7 @@ String CalcTypeNameConvert::Format(const char *raw_name)
Value CalcType<double>::ToValue(double t)
{
if(IsNan(t))
if(IsNaN(t))
throw Exc(CalcNanError());
if(IsInf(t))
throw Exc(CalcInfError());

3
uppsrc/TCore/util.cpp
View file

@ -13,6 +13,8 @@
NAMESPACE_UPP
<<<<<<< .mine
=======
bool IsNan(double t)
{
#ifdef PLATFORM_WIN32
@ -25,6 +27,7 @@ bool IsNan(double t)
#endif
}
>>>>>>> .r6907
void WeakBase::Chk() const
{
if(!this)

3
uppsrc/TCore/util.h
View file

@ -19,9 +19,6 @@ char GetHotKeyText(longlong_t hotkey); // returns symbolic name of hot
String StripHotText(const char* s);
String HotTextToSmartText(const char *s);
bool IsNan(double d);
bool IsInf(double d);
inline int abs2 (Size p) { return p.cx * p.cx + p.cy * p.cy; }
inline int abs (Size p) { return (int)hypot(p.cx, p.cy); }
inline int MulVector (Size a, Size b) { return a.cx * b.cy - a.cy * b.cx; }