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

BCB551 and VC6 compatibility fixes

Browse Source 
[SVN r20565]
This commit is contained in:
Fernando Cacciola
2003-10-30 14:45:50 +00:00
parent 9adda8450b
commit d0cf7efaf0
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/optional.hpp
View File

@ -64,14 +64,23 @@
#endif #endif
#if BOOST_WORKAROUND(__BORLANDC__, <= 0x564) #if BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
// VC7.0 has the following bug: // BCB (up to 5.64) has the following bug:
// When both a non-template and a template copy-ctor exist // If there is a member function/operator template of the form
// and the templated version is made 'explicit', the explicit is also // template<class Expr> mfunc( Expr expr ) ;
// given to the non-templated version, making the class non-implicitely-copyable. // some calls are resolved to this even if there are other better matches.
// // The effect of this bug is that calls to converting ctors and assignments
// are incrorrectly sink to this general catch-all member function template as shown above.
#define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION #define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
#endif #endif
#if BOOST_WORKAROUND(__BORLANDC__, < 0x560)
// BCB (5.5.1) defines BOOST_NESTED_TEMPLATE as 'template' but in this context it produces an error.
#define BOOST_OPTIONAL_NESTED_TEMPLATE
#else
#define BOOST_OPTIONAL_NESTED_TEMPLATE BOOST_NESTED_TEMPLATE
#endif
namespace boost { namespace boost {
class InPlaceFactoryBase ; class InPlaceFactoryBase ;
@ -80,7 +89,7 @@ class TypedInPlaceFactoryBase ;
namespace optional_detail { namespace optional_detail {
// This local class is used instead of that in "aligned_storage.hpp" // This local class is used instead of that in "aligned_storage.hpp"
// because I've found the 'official' class to ICE BCB5.5 // because I've found the 'official' class to ICE BCB5.5
// when some types are used with optional<> // when some types are used with optional<>
// (due to sizeof() passed down as a non-type template parameter) // (due to sizeof() passed down as a non-type template parameter)
template <class T> template <class T>
@ -701,6 +710,7 @@ 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