Update of /cvsroot/boost/boost/boost/tr1
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4781
Modified Files:
Tag: RC_1_34_0
complex.hpp
Log Message:
Revised workarounds for Borland 2006
Index: complex.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/tr1/complex.hpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- complex.hpp 16 Nov 2005 18:33:14 -0000 1.4
+++ complex.hpp 5 Jun 2006 19:13:21 -0000 1.4.2.1
@@ -15,7 +15,7 @@
#include <boost/detail/workaround.hpp>
#include <cmath>
-namespace std{
+namespace std{
#ifdef BOOST_NO_STDC_NAMESPACE
using :: atan2;
@@ -89,7 +89,7 @@
return ct;
}
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) &&
!BOOST_WORKAROUND(BOOST_MSVC, < 1310)
+#if !BOOST_WORKAROUND(__BORLANDC__, <=0x570) && !BOOST_WORKAROUND(BOOST_MSVC,
< 1310)
inline complex<double> polar(const char& rho, const char& theta = 0)
{ return ::std::polar(static_cast<double>(rho), static_cast<double>(theta)); }
inline complex<double> polar(const unsigned char& rho, const unsigned char&
theta = 0)
@@ -120,11 +120,11 @@
{ return ::std::polar(static_cast<double>(rho), static_cast<double>(theta)); }
#endif
-template<class T, class U>
-inline complex<typename ::boost::tr1_detail::promote_to_real<T, U>::type>
+template<class T, class U>
+inline complex<typename boost::tr1_detail::promote_to_real<T, U>::type>
polar(const T& rho, const U& theta)
{
- typedef typename ::boost::tr1_detail::promote_to_real<T, U>::type real_type;
+ typedef typename boost::tr1_detail::promote_to_real<T, U>::type real_type;
return std::polar(static_cast<real_type>(rho),
static_cast<real_type>(theta));
}
#endif
@@ -182,12 +182,12 @@
cast2_type y1(y);
return std::pow(x1, y1);
}
-template<class T, class U>
+template<class T, class U>
inline complex<typename boost::tr1_detail::promote_to_real<T, U>::type>
pow (const complex<T>& x, const U& y)
{
typedef typename boost::tr1_detail::promote_to_real<T, U>::type real_type;
- typedef complex<typename ::boost::tr1_detail::promote_to_real<T, U>::type>
result_type;
+ typedef complex<typename boost::tr1_detail::promote_to_real<T, U>::type>
result_type;
typedef typename boost::mpl::if_<boost::is_same<result_type, complex<T> >,
result_type const&, result_type>::type cast1_type;
real_type r = y;
cast1_type x1(x);
@@ -195,12 +195,12 @@
return std::pow(x1, y1);
}
-template<class T, class U>
+template<class T, class U>
inline complex<typename boost::tr1_detail::promote_to_real<T, U>::type>
pow (const T& x, const complex<U>& y)
{
typedef typename boost::tr1_detail::promote_to_real<T, U>::type real_type;
- typedef complex<typename ::boost::tr1_detail::promote_to_real<T, U>::type>
result_type;
+ typedef complex<typename boost::tr1_detail::promote_to_real<T, U>::type>
result_type;
typedef typename boost::mpl::if_<boost::is_same<result_type, complex<U> >,
result_type const&, result_type>::type cast_type;
real_type r = x;
std::complex<real_type> x1(r);
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
