feedc0de/boost_optional
1
0
Fork 0
forked from boostorg/optional
Code Pull Requests Activity

Still mre bcc5.5.1 compat fixes

Browse Source 
[SVN r20727]
This commit is contained in:
Fernando Cacciola
2003-11-07 14:57:30 +00:00
parent 6c70e16379
commit f8fe66e289
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/optional.hpp
View File

@ -70,10 +70,8 @@
#if BOOST_WORKAROUND(__BORLANDC__, <= 0x551) #if BOOST_WORKAROUND(__BORLANDC__, <= 0x551)
// BCB (5.5.1) defines BOOST_NESTED_TEMPLATE as 'template' but in this context it produces an error. // BCB (5.5.1) cannot parse the nested template struct in an inplace factory.
#define BOOST_OPTIONAL_NESTED_TEMPLATE #define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
#else
#define BOOST_OPTIONAL_NESTED_TEMPLATE BOOST_NESTED_TEMPLATE
#endif #endif
namespace boost { namespace boost {
@ -213,7 +211,7 @@ class optional_base : public optional_tag
if ( rhs.is_initialized() ) if ( rhs.is_initialized() )
construct(rhs.get_impl()); construct(rhs.get_impl());
} }
// Assigns from a T (deep-copies the rhs value) // Assigns from a T (deep-copies the rhs value)
// Basic Guarantee: If T::( T const& ) throws, this is left UNINITIALIZED // Basic Guarantee: If T::( T const& ) throws, this is left UNINITIALIZED
void assign ( argument_type val ) void assign ( argument_type val )
@ -267,7 +265,7 @@ class optional_base : public optional_tag
void construct ( Expr const& factory, InPlaceFactoryBase const* ) void construct ( Expr const& factory, InPlaceFactoryBase const* )
{ {
BOOST_STATIC_ASSERT ( ::boost::mpl::not_<is_reference_predicate>::value ) ; BOOST_STATIC_ASSERT ( ::boost::mpl::not_<is_reference_predicate>::value ) ;
factory.BOOST_OPTIONAL_NESTED_TEMPLATE apply<value_type>(m_storage.address()) ; factory.BOOST_NESTED_TEMPLATE apply<value_type>(m_storage.address()) ;
m_initialized = true ; m_initialized = true ;
} }
@ -706,8 +704,6 @@ template<class T> inline void swap ( optional<T>& x, optional<T>& y )
optional_detail::optional_swap(x,y); optional_detail::optional_swap(x,y);
} }
#undef BOOST_OPTIONAL_NESTED_TEMPLATE
} // namespace boost } // namespace boost
#endif #endif