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

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

Browse Source 
[SVN r19686]
This commit is contained in:
Jens Maurer
2003-08-18 18:51:55 +00:00
parent 042d3e08b8
commit 5a595a9a92
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/optional.hpp
View File

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