Again, just updating workarounds to recognise the latest compiler version. Fixing optional fixes dependant libraries as well. cvs diff -u -wb -- boost\optional\optional.hpp (in directory E:\sourceforge\devel\boost\) Index: boost/optional/optional.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/optional/optional.hpp,v retrieving revision 1.7 diff -u -w -b -r1.7 optional.hpp --- boost/optional/optional.hpp 25 Aug 2005 16:27:21 -0000 1.7 +++ boost/optional/optional.hpp 25 Jan 2006 19:44:52 -0000 @@ -64,7 +64,7 @@ #endif #if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) \ - && BOOST_WORKAROUND(__BORLANDC__, <= 0x564) + && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581) ) // BCB (up to 5.64) has the following bug: // If there is a member function/operator template of the form // template<class Expr> mfunc( Expr expr ) ; @@ -382,7 +382,7 @@ reference_const_type dereference( internal_type const* p, is_reference_tag ) const { return p->get() ; } reference_type dereference( internal_type* p, is_reference_tag ) { return p->get() ; } -#if BOOST_WORKAROUND(__BORLANDC__, <= 0x564) +#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581) ) void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; } #else void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->T::~T() ; m_initialized = false ; } -- AlisdairM