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

MSVC6.0 Fixes

Browse Source 
[SVN r17049]
This commit is contained in:
Fernando Cacciola
2003-01-27 13:54:57 +00:00
parent 716dbf8c66
commit 9461f09cb8
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/optional.hpp
View File

@ -20,10 +20,16 @@
#include<new>
#include<algorithm>
#include "boost/config.hpp"
#include "boost/assert.hpp"
#include "boost/type_traits/alignment_of.hpp"
#include "boost/type_traits/type_with_alignment.hpp"
// MSVC6.0 doesn't like separated templated contructor/assignment,
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1200 ) // 1200 == VC++ 6.0
#define BOOST_OPTIONAL_NO_CONVERTIONS
#endif
namespace boost
{
@ -84,6 +90,7 @@ class optional
construct(*rhs);
}
#ifndef BOOST_OPTIONAL_NO_CONVERTIONS
// Creates a deep copy of another convertible optional<U>
// Requires a valid conversion from U to T.
// Can throw if T::T(U const&) does
@ -95,6 +102,7 @@ class optional
if ( rhs )
construct(*rhs);
}
#endif
// No-throw (assuming T::~T() doesn't)
~optional() { destroy() ; }
@ -114,6 +122,7 @@ class optional
return *this ;
}
#ifndef BOOST_OPTIONAL_NO_CONVERTIONS
// Assigns from another convertible optional<U> (converts && deep-copies the rhs value)
// Requires a valid conversion from U to T.
// Basic Guarantee: If T::T( U const& ) throws, this is left UNINITIALIZED
@ -130,6 +139,7 @@ class optional
}
return *this ;
}
#endif
// Destroys the current value, if any, leaving this UNINITIALIZED
// No-throw (assuming T::~T() doesn't)