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

Optional: Remove obsolete GCC version checks.

Browse Source 
[SVN r86068]
This commit is contained in:
Stephen Kelly
2013-09-30 15:58:48 +00:00
parent c9ead30713
commit 3cf0363668
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/optional/optional.hpp
View File

@ -63,8 +63,7 @@
#define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION #define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
#endif #endif
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 302 \ #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
&& !defined(__INTEL_COMPILER)
// GCC since 3.3 has may_alias attribute that helps to alleviate optimizer issues with // GCC since 3.3 has may_alias attribute that helps to alleviate optimizer issues with
// regard to violation of the strict aliasing rules. The optional< T > storage type is marked // regard to violation of the strict aliasing rules. The optional< T > storage type is marked
// with this attribute in order to let the compiler know that it will alias objects of type T // with this attribute in order to let the compiler know that it will alias objects of type T

14
include/boost/optional/optional_io.hpp
View File

@ -12,18 +12,8 @@
#ifndef BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP #ifndef BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
#define BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP #define BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
#if defined __GNUC__ #include <istream>
# if (__GNUC__ == 2 && __GNUC_MINOR__ <= 97) #include <ostream>
# define BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
# endif
#endif // __GNUC__
#if defined BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
# include <iostream>
#else
# include <istream>
# include <ostream>
#endif
#include <boost/none.hpp> #include <boost/none.hpp>
#include <boost/assert.hpp> #include <boost/assert.hpp>