boost/math
2
0
Fork 0
mirror of https://github.com/boostorg/math.git synced 2026-02-13 00:22:23 +00:00
Code Issues Projects Releases Wiki Activity

remove minmax hack from win32.hpp and fix all places that could be affected by the minmax macros

Browse Source 
[SVN r22394]
This commit is contained in:
Eric Niebler
2004-02-26 18:27:02 +00:00
parent e8ddc9e36f
commit a607b80188
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/math/octonion.hpp
View File

@@ -969,7 +969,7 @@ namespace boost
tr[0] = rhs.real(); \
tr[1] = rhs.imag(); \
\
type mixam = BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max(); \
type mixam = (BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max)(); \
\
tr *= mixam; \
\
@@ -1011,7 +1011,7 @@ namespace boost
tr[0] = rhs.real(); \
tr[1] = rhs.imag(); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -1052,7 +1052,7 @@ namespace boost
tr[0] = rhs.real(); \
tr[1] = rhs.imag(); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -1097,7 +1097,7 @@ namespace boost
tr[2] = static_cast<type>(rhs.R_component_3()); \
tr[3] = static_cast<type>(rhs.R_component_4()); \
\
type mixam = BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max(); \
type mixam = (BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max)();\
\
tr *= mixam; \
\
@@ -1141,7 +1141,7 @@ namespace boost
tr[2] = static_cast<type>(rhs.R_component_3()); \
tr[3] = static_cast<type>(rhs.R_component_4()); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -1184,7 +1184,7 @@ namespace boost
tr[2] = static_cast<type>(rhs.R_component_3()); \
tr[3] = static_cast<type>(rhs.R_component_4()); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -1234,7 +1234,7 @@ namespace boost
tr[6] = static_cast<type>(rhs.R_component_7()); \
tr[7] = static_cast<type>(rhs.R_component_8()); \
\
type mixam = BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max(); \
type mixam = (BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max)();\
\
tr *= mixam; \
\
@@ -1283,7 +1283,7 @@ namespace boost
tr[6] = static_cast<type>(rhs.R_component_7()); \
tr[7] = static_cast<type>(rhs.R_component_8()); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -1331,7 +1331,7 @@ namespace boost
tr[6] = static_cast<type>(rhs.R_component_7()); \
tr[7] = static_cast<type>(rhs.R_component_8()); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -4405,9 +4405,9 @@ namespace boost
BOOST_OCTONION_VALARRAY_LOADER
#if defined(__GNUC__) && __GNUC__ < 3
return(BOOST_GET_VALARRAY(T, abs(temp)).max());
return((BOOST_GET_VALARRAY(T, abs(temp)).max)());
#else
return(abs(temp).max());
return((abs(temp).max)());
#endif /* defined(__GNUC__) && (__GNUC__ < 3) */
}
@@ -4441,9 +4441,9 @@ namespace boost
BOOST_OCTONION_VALARRAY_LOADER
#if defined(__GNUC__) && __GNUC__ < 3
T maxim = BOOST_GET_VALARRAY(T,abs(temp)).max(); // overflow protection
T maxim = (BOOST_GET_VALARRAY(T,abs(temp)).max)(); // overflow protection
#else
T maxim = abs(temp).max(); // overflow protection
T maxim = (abs(temp).max)(); // overflow protection
#endif /* defined(__GNUC__) && (__GNUC__ < 3) */
if (maxim == static_cast<T>(0))

20
include/boost/math/quaternion.hpp
View File

@@ -611,7 +611,7 @@ namespace boost
tr[0] = rhs.real(); \
tr[1] = rhs.imag(); \
\
type mixam = BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max(); \
type mixam = (BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max)(); \
\
tr *= mixam; \
\
@@ -645,7 +645,7 @@ namespace boost
tr[0] = rhs.real(); \
tr[1] = rhs.imag(); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -678,7 +678,7 @@ namespace boost
tr[0] = rhs.real(); \
tr[1] = rhs.imag(); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -716,7 +716,7 @@ namespace boost
tr[2] = static_cast<type>(rhs.R_component_3()); \
tr[3] = static_cast<type>(rhs.R_component_4()); \
\
type mixam = BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max(); \
type mixam = (BOOST_GET_VALARRAY(type,static_cast<type>(1)/abs(tr)).max)(); \
\
tr *= mixam; \
\
@@ -753,7 +753,7 @@ namespace boost
tr[2] = static_cast<type>(rhs.R_component_3()); \
tr[3] = static_cast<type>(rhs.R_component_4()); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -789,7 +789,7 @@ namespace boost
tr[2] = static_cast<type>(rhs.R_component_3()); \
tr[3] = static_cast<type>(rhs.R_component_4()); \
\
type mixam = static_cast<type>(1)/abs(tr).max(); \
type mixam = static_cast<type>(1)/(abs(tr).max)(); \
\
tr *= mixam; \
\
@@ -1587,9 +1587,9 @@ namespace boost
BOOST_QUATERNION_VALARRAY_LOADER
#if defined(__GNUC__) && __GNUC__ < 3
return(BOOST_GET_VALARRAY(T, abs(temp)).max());
return((BOOST_GET_VALARRAY(T, abs(temp)).max)());
#else
return(abs(temp).max());
return((abs(temp).max)());
#endif /* defined(__GNUC__) && (__GNUC__ < 3) */
}
@@ -1623,9 +1623,9 @@ namespace boost
BOOST_QUATERNION_VALARRAY_LOADER
#if defined(__GNUC__) && __GNUC__ < 3
T maxim = BOOST_GET_VALARRAY(T, abs(temp)).max(); // overflow protection
T maxim = (BOOST_GET_VALARRAY(T, abs(temp)).max)(); // overflow protection
#else
T maxim = abs(temp).max(); // overflow protection
T maxim = (abs(temp).max)(); // overflow protection
#endif /* defined(__GNUC__) && (__GNUC__ < 3) */
if (maxim == static_cast<T>(0))