Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxIsSameDouble() which wraps double comparison in a pragmas disabling icc warning about it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 18:14:53 +00:00
parent 6cf2fb76fe
commit bc14c8b21f
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gdicmn.h
View File

@@ -21,6 +21,7 @@
#include "wx/string.h"
#include "wx/fontenc.h"
#include "wx/hashmap.h"
#include "wx/math.h"
// ---------------------------------------------------------------------------
// forward declarations
@@ -269,10 +270,14 @@ public:
wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }
bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }
bool operator!=(const wxRealPoint& pt) const { return x != pt.x || y != pt.y; }
bool operator==(const wxRealPoint& pt) const
{
return wxIsSameDouble(x, pt.x) && wxIsSameDouble(y, pt.y);
}
bool operator!=(const wxRealPoint& pt) const { return !(*this == pt); }
};
class WXDLLEXPORT wxPoint
{
public:

21
include/wx/math.h
View File

@@ -76,5 +76,26 @@
#define wxIsNaN(x) ((x) != (x))
#endif
#ifdef __cplusplus
#ifdef __INTELC__
inline bool wxIsSameDouble(double x, double y)
{
// VZ: this warning, given for operators==() and !=() is not wrong, as ==
// shouldn't be used with doubles, but we get too many of them and
// removing these operators is probably not a good idea
#pragma warning(push)
// floating-point equality and inequality comparisons are unreliable
#pragma warning(disable: 1572)
return x == y;
#pragma warning(pop)
}
#else /* !__INTELC__ */
inline bool wxIsSameDouble(double x, double y) { return x == y; }
#endif /* __INTELC__/!__INTELC__ */
#endif /* __cplusplus */
#endif /* _WX_MATH_H_ */