Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50476 - trunk/boost/test/utils
From: gennadiy.rozental_at_[hidden]
Date: 2009-01-05 04:42:31


Author: rogeeff
Date: 2009-01-05 04:42:30 EST (Mon, 05 Jan 2009)
New Revision: 50476
URL: http://svn.boost.org/trac/boost/changeset/50476

Log:
more borland fixes
Text files modified:
   trunk/boost/test/utils/class_properties.hpp | 4 ----
   trunk/boost/test/utils/named_params.hpp | 3 ++-
   2 files changed, 2 insertions(+), 5 deletions(-)

Modified: trunk/boost/test/utils/class_properties.hpp
==============================================================================
--- trunk/boost/test/utils/class_properties.hpp (original)
+++ trunk/boost/test/utils/class_properties.hpp 2009-01-05 04:42:30 EST (Mon, 05 Jan 2009)
@@ -48,11 +48,7 @@
 protected:
     typedef typename call_traits<PropertyType>::const_reference read_access_t;
     typedef typename call_traits<PropertyType>::param_type write_param_t;
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570))
- typedef typename add_pointer<PropertyType const>::type address_res_t;
-#else
     typedef typename add_pointer<typename add_const<PropertyType>::type>::type address_res_t;
-#endif
 public:
     // Constructor
                     class_property() : value( PropertyType() ) {}

Modified: trunk/boost/test/utils/named_params.hpp
==============================================================================
--- trunk/boost/test/utils/named_params.hpp (original)
+++ trunk/boost/test/utils/named_params.hpp 2009-01-05 04:42:30 EST (Mon, 05 Jan 2009)
@@ -139,7 +139,8 @@
     void erase( keyword<typename NP::id,false> kw ) const { m_param.erase( kw ); }
     using Rest::erase;
 
-#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206))
+#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206)) || \
+ BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0610))
     template<typename NP>
     named_parameter_combine<NP,self_type> operator,( NP const& np ) const
     { return named_parameter_combine<NP,self_type>( np, *this ); }


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