|
Boost-Commit : |
From: steven_at_[hidden]
Date: 2008-06-17 22:32:35
Author: steven_watanabe
Date: 2008-06-17 22:32:35 EDT (Tue, 17 Jun 2008)
New Revision: 46467
URL: http://svn.boost.org/trac/boost/changeset/46467
Log:
Use BOOST_PREVENT_MACRO_SUBSTITUTION to clear the acc-pa_risc failures
Text files modified:
trunk/boost/units/detail/cmath_impl.hpp | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
Modified: trunk/boost/units/detail/cmath_impl.hpp
==============================================================================
--- trunk/boost/units/detail/cmath_impl.hpp (original)
+++ trunk/boost/units/detail/cmath_impl.hpp 2008-06-17 22:32:35 EDT (Tue, 17 Jun 2008)
@@ -25,6 +25,7 @@
#include <boost/units/detail/cmath_msvc_impl.hpp>
# endif
+#include <boost/config.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
namespace boost {
@@ -32,48 +33,48 @@
namespace detail {
template<class Y>
-inline bool isgreater(const Y& v1,const Y& v2)
+inline bool isgreater BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
else return v1 > v2;
}
template<class Y>
-inline bool isgreaterequal(const Y& v1,const Y& v2)
+inline bool isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
else return v1 >= v2;
}
template<class Y>
-inline bool isless(const Y& v1,const Y& v2)
+inline bool isless BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
else return v1 < v2;
}
template<class Y>
-inline bool islessequal(const Y& v1,const Y& v2)
+inline bool islessequal BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
else return v1 <= v2;
}
template<class Y>
-inline bool islessgreater(const Y& v1,const Y& v2)
+inline bool islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1) || (boost::math::isnan)(v2)) return false;
else return v1 < v2 || v1 > v2;
}
template<class Y>
-inline bool isunordered(const Y& v1,const Y& v2)
+inline bool isunordered BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
return (boost::math::isnan)(v1) || (boost::math::isnan)(v2);
}
template<class Y>
-inline Y fdim(const Y& v1,const Y& v2)
+inline Y fdim BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1)) return v1;
else if((boost::math::isnan)(v2)) return v2;
@@ -101,7 +102,7 @@
#endif
template<class Y>
-inline Y fmax(const Y& v1,const Y& v2)
+inline Y fmax BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1)) return(v2);
else if((boost::math::isnan)(v2)) return(v1);
@@ -110,7 +111,7 @@
}
template<class Y>
-inline Y fmin(const Y& v1,const Y& v2)
+inline Y fmin BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& v1,const Y& v2)
{
if((boost::math::isnan)(v1)) return(v2);
else if((boost::math::isnan)(v2)) return(v1);
@@ -153,7 +154,7 @@
#endif
template<class Y>
-inline Y trunc(const Y& val)
+inline Y trunc BOOST_PREVENT_MACRO_SUBSTITUTION(const Y& val)
{
if(val > 0) return std::floor(val);
else if(val < 0) return std::ceil(val);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk