[Boost-commit] svn:boost r86068 - trunk/boost/optional

Subject: [Boost-commit] svn:boost r86068 - trunk/boost/optional
From: steveire_at_[hidden]
Date: 2013-09-30 11:58:48

Author: skelly
Date: 2013-09-30 11:58:48 EDT (Mon, 30 Sep 2013)
New Revision: 86068
URL: http://svn.boost.org/trac/boost/changeset/86068

Log:
Optional: Remove obsolete GCC version checks.

Text files modified: 
   trunk/boost/optional/optional.hpp    |     3 +--                                     
   trunk/boost/optional/optional_io.hpp |    14 ++------------                          
   2 files changed, 3 insertions(+), 14 deletions(-)

Modified: trunk/boost/optional/optional.hpp
==============================================================================
--- trunk/boost/optional/optional.hpp	Mon Sep 30 11:58:35 2013	(r86067)
+++ trunk/boost/optional/optional.hpp	2013-09-30 11:58:48 EDT (Mon, 30 Sep 2013)	(r86068)
@@ -63,8 +63,7 @@
 #define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 302 \
-    && !defined(__INTEL_COMPILER)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
 // 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
 // with this attribute in order to let the compiler know that it will alias objects of type T

Modified: trunk/boost/optional/optional_io.hpp
==============================================================================
--- trunk/boost/optional/optional_io.hpp	Mon Sep 30 11:58:35 2013	(r86067)
+++ trunk/boost/optional/optional_io.hpp	2013-09-30 11:58:48 EDT (Mon, 30 Sep 2013)	(r86068)
@@ -12,18 +12,8 @@
 #ifndef BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 #define BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 
-#if defined __GNUC__
-#  if (__GNUC__ == 2 && __GNUC_MINOR__ <= 97)
-#    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 <istream>
+#include <ostream>
 
 #include <boost/none.hpp>
 #include <boost/assert.hpp>