[Boost-commit] svn:boost r86078 - in trunk/boost/iostreams: . detail/config detail/streambuf filter

Subject: [Boost-commit] svn:boost r86078 - in trunk/boost/iostreams: . detail/config detail/streambuf filter
From: steveire_at_[hidden]
Date: 2013-09-30 12:02:26

Author: skelly
Date: 2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)
New Revision: 86078
URL: http://svn.boost.org/trac/boost/changeset/86078

Log:
IOStreams: Remove obsolete GCC version checks.

Text files modified: 
   trunk/boost/iostreams/chain.hpp                               |     2 +-                                      
   trunk/boost/iostreams/code_converter.hpp                      |     8 --------                                
   trunk/boost/iostreams/detail/config/overload_resolution.hpp   |     3 +--                                     
   trunk/boost/iostreams/detail/streambuf/chainbuf.hpp           |     3 ---                                     
   trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp   |     2 --                                      
   trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp |     2 --                                      
   trunk/boost/iostreams/filter/gzip.hpp                         |     8 +-------                                
   trunk/boost/iostreams/filter/line.hpp                         |     8 +-------                                
   8 files changed, 4 insertions(+), 32 deletions(-)

Modified: trunk/boost/iostreams/chain.hpp
==============================================================================
--- trunk/boost/iostreams/chain.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/chain.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -46,7 +46,7 @@
 
 // Sometimes type_info objects must be compared by name. Borrowed from
 // Boost.Python and Boost.Function.
-#if (defined(__GNUC__) && __GNUC__ >= 3) || \
+#if defined(__GNUC__) || \
      defined(_AIX) || \
     (defined(__sgi) && defined(__host_mips)) || \
     (defined(linux) && defined(__INTEL_COMPILER) && defined(__ICC)) \

Modified: trunk/boost/iostreams/code_converter.hpp
==============================================================================
--- trunk/boost/iostreams/code_converter.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/code_converter.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -264,14 +264,6 @@
     ));
 public:
     code_converter() { }
-#if BOOST_WORKAROUND(__GNUC__, < 3)
-    code_converter(code_converter& rhs) 
-        : code_converter_base<Device, Codecvt, Alloc>(rhs)
-        { }
-    code_converter(const code_converter& rhs) 
-        : code_converter_base<Device, Codecvt, Alloc>(rhs)
-        { }
-#endif
     BOOST_IOSTREAMS_FORWARD( code_converter, open_impl, Device,
                              BOOST_IOSTREAMS_CONVERTER_PARAMS, 
                              BOOST_IOSTREAMS_CONVERTER_ARGS )

Modified: trunk/boost/iostreams/detail/config/overload_resolution.hpp
==============================================================================
--- trunk/boost/iostreams/detail/config/overload_resolution.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/detail/config/overload_resolution.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -22,8 +22,7 @@
 #if !defined(BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION)
 # if BOOST_WORKAROUND(__MWERKS__, <= 0x3003) || \
      BOOST_WORKAROUND(__BORLANDC__, < 0x600) || \
-     BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || \
-     BOOST_WORKAROUND(BOOST_IOSTREAMS_GCC, <= 295) \
+     BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
      /**/
 #  define BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION
 # endif

Modified: trunk/boost/iostreams/detail/streambuf/chainbuf.hpp
==============================================================================
--- trunk/boost/iostreams/detail/streambuf/chainbuf.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/detail/streambuf/chainbuf.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -75,9 +75,6 @@
                  typename Chain::char_type,
                  typename Chain::traits_type
              )                                               base_type;
-//#if !BOOST_WORKAROUND(__GNUC__, == 2)                                 
-//    BOOST_IOSTREAMS_USING_PROTECTED_STREAMBUF_MEMBERS(base_type)
-//#endif
 private:
 
     // Translate from std int_type to chain's int_type.

Modified: trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp
==============================================================================
--- trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/detail/streambuf/direct_streambuf.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -67,9 +67,7 @@
     // Declared in linked_streambuf.
     T* component() { return storage_.get(); }
 protected:
-#if !BOOST_WORKAROUND(__GNUC__, == 2)
     BOOST_IOSTREAMS_USING_PROTECTED_STREAMBUF_MEMBERS(base_type)
-#endif
     direct_streambuf();
 
     //--------------Virtual functions-----------------------------------------//

Modified: trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp
==============================================================================
--- trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/detail/streambuf/indirect_streambuf.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -73,9 +73,7 @@
     // Declared in linked_streambuf.
     T* component() { return &*obj(); }
 protected:
-#if !BOOST_WORKAROUND(__GNUC__, == 2)
     BOOST_IOSTREAMS_USING_PROTECTED_STREAMBUF_MEMBERS(base_type)
-#endif
 
     //----------virtual functions---------------------------------------------//
 

Modified: trunk/boost/iostreams/filter/gzip.hpp
==============================================================================
--- trunk/boost/iostreams/filter/gzip.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/filter/gzip.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -292,13 +292,7 @@
 
     void close_impl()
     {
-        #if BOOST_WORKAROUND(__GNUC__, == 2) && defined(__STL_CONFIG_H) || \
-            BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) \
-            /**/
-            footer_.erase(0, std::string::npos);
-        #else
-            footer_.clear();
-        #endif
+        footer_.clear();
         offset_ = 0;
         flags_ = 0;
     }

Modified: trunk/boost/iostreams/filter/line.hpp
==============================================================================
--- trunk/boost/iostreams/filter/line.hpp	Mon Sep 30 12:01:57 2013	(r86077)
+++ trunk/boost/iostreams/filter/line.hpp	2013-09-30 12:02:26 EDT (Mon, 30 Sep 2013)	(r86078)
@@ -37,13 +37,7 @@
 // Description: Filter which processes data one line at a time.
 //
 template< typename Ch,
-          typename Alloc =
-          #if BOOST_WORKAROUND(__GNUC__, < 3)
-              typename std::basic_string<Ch>::allocator_type
-          #else
-              std::allocator<Ch>
-          #endif
-          >
+          typename Alloc = std::allocator<Ch> >
 class basic_line_filter {
 private:
     typedef typename std::basic_string<Ch>::traits_type  string_traits;