Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / math.h

diff --git a/include/wx/math.h b/include/wx/math.h
index 3053d11f5645833b2ef259d8a82f81065f125e0b..5240f1759e527b4cf61b840bc53f4fd5a005e83b 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -24,7 +24,7 @@
 
 /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
 #ifndef METRIC_CONVERSION_CONSTANT
 
 /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
 #ifndef METRIC_CONVERSION_CONSTANT

-    #define METRIC_CONVERSION_CONSTANT (1./254)
+    #define METRIC_CONVERSION_CONSTANT (1/25.4)

 #endif
 
 #ifndef mm2inches
 #endif
 
 #ifndef mm2inches


@@ -57,13 +57,15 @@
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
     #include <float.h>
     #define wxFinite(x) _finite(x)
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
     #include <float.h>
     #define wxFinite(x) _finite(x)

-#elif defined(__MINGW64__)
-    // add more compilers with C99 support here: using C99 isfinite() is
-    // preferable to using BSD-ish finite()
+#elif defined(__MINGW64__) || defined(__clang__)
+    /*
+        add more compilers with C99 support here: using C99 isfinite() is
+        preferable to using BSD-ish finite()
+     */

     #define wxFinite(x) isfinite(x)
 #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
     #define wxFinite(x) isfinite(x)
 #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \

-      defined(__HPUX__)||defined(__MWERKS__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
+      defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )

 #ifdef __SOLARIS__
 #include <ieeefp.h>
 #endif
 #ifdef __SOLARIS__
 #include <ieeefp.h>
 #endif


@@ -77,7 +79,7 @@
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \

-      defined(__HPUX__)||defined(__MWERKS__)
+      defined(__HPUX__)

     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))
     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))


@@ -105,8 +107,9 @@
         }
 
     #else /* !__INTELC__ */
         }
 
     #else /* !__INTELC__ */

-
+        wxGCC_WARNING_SUPPRESS(float-equal)

         inline bool wxIsSameDouble(double x, double y) { return x == y; }
         inline bool wxIsSameDouble(double x, double y) { return x == y; }

+        wxGCC_WARNING_RESTORE(float-equal)

 
     #endif /* __INTELC__/!__INTELC__ */
 
 
     #endif /* __INTELC__/!__INTELC__ */
 


@@ -115,7 +118,7 @@
     inline int wxRound(double x)
     {
         wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
     inline int wxRound(double x)
     {
         wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,

-                      _T("argument out of supported range") );
+                      wxT("argument out of supported range") );

 
         #if defined(HAVE_ROUND)
             return int(round(x));
 
         #if defined(HAVE_ROUND)
             return int(round(x));


@@ -126,12 +129,10 @@
 #endif /* __cplusplus */
 
 
 #endif /* __cplusplus */
 
 

-#if defined(__WXMSW__) && !defined(__WXWINCE__)
+#if defined(__WINDOWS__) && !defined(__WXWINCE__)

     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )

-#elif defined( __WXMAC__ )
-    #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )

 #else
 #else

-    #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
+    #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))

 #endif
 
 #if wxUSE_APPLE_IEEE
 #endif
 
 #if wxUSE_APPLE_IEEE


@@ -146,7 +147,7 @@
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
     wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
 #if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
     wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );

-#endif // WXWIN_COMPATIBILITY_2_8
+#endif

 
 #ifdef __cplusplus
     }
 
 #ifdef __cplusplus
     }