repair the previous GCC fix, now works on gcc 2.95, 3.0, and 3.3

[SVN r19686]
This commit is contained in:
Jens Maurer
2003-08-18 18:51:55 +00:00
parent 042d3e08b8
commit 5a595a9a92

View File

@ -271,8 +271,8 @@ bool operator != ( optional<T> const& x, optional<T> const& y )
//
namespace optional_detail {
#ifdef __GNUC__
// workaround for GCC (JM):
#if defined(__GNUC__) && (BOOST_WORKAROUND(__GNUC__, <= 2) || __GNUC__ == 3 && BOOST_WORKAROUND(__GNUC_MINOR__, < 3))
// workaround for GCC earlier than version 3.3 (JM):
using std::swap;
#endif
@ -296,7 +296,7 @@ void optional_swap ( optional<T>& x, optional<T>& y )
}
else if ( !!x && !!y )
{
#ifndef BOOST_NO_STDC_NAMESPACE
#if !(defined(__GNUC__) && (BOOST_WORKAROUND(__GNUC__, <= 2) || __GNUC__ == 3 && BOOST_WORKAROUND(__GNUC_MINOR__, < 3)))
// allow for Koenig lookup
using std::swap ;
#endif