From d143cd650260a0bc97b4675af6e9ff371b68e6fe Mon Sep 17 00:00:00 2001
From: rylek <rylek@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 11 Feb 2014 07:10:16 +0000
Subject: [PATCH] Odstraneni IsNan a IsInf z TCore (pridano do Core)

git-svn-id: svn://ultimatepp.org/upp/trunk@6908 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/TCore/CalcType.cpp | 2 +-
 uppsrc/TCore/util.cpp     | 3 +++
 uppsrc/TCore/util.h       | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/uppsrc/TCore/CalcType.cpp b/uppsrc/TCore/CalcType.cpp
index 5f85f3504..be2cb30a0 100644
--- a/uppsrc/TCore/CalcType.cpp
+++ b/uppsrc/TCore/CalcType.cpp
@@ -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());
diff --git a/uppsrc/TCore/util.cpp b/uppsrc/TCore/util.cpp
index 6dbc18f15..4ba2ba063 100644
--- a/uppsrc/TCore/util.cpp
+++ b/uppsrc/TCore/util.cpp
@@ -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)
diff --git a/uppsrc/TCore/util.h b/uppsrc/TCore/util.h
index 953fa5fcf..08a3bfa89 100644
--- a/uppsrc/TCore/util.h
+++ b/uppsrc/TCore/util.h
@@ -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; }