[Boost-commit] svn:boost r86040 - in trunk/boost/format: . detail

Subject: [Boost-commit] svn:boost r86040 - in trunk/boost/format: . detail
From: steveire_at_[hidden]
Date: 2013-09-29 20:21:57

Author: skelly
Date: 2013-09-29 20:21:57 EDT (Sun, 29 Sep 2013)
New Revision: 86040
URL: http://svn.boost.org/trac/boost/changeset/86040

Log:
Format: Remove obsolete MSVC version checks.

Text files modified: 
   trunk/boost/format/detail/msvc_disambiguater.hpp  |     6 ++----                                  
   trunk/boost/format/detail/workarounds_stlport.hpp |     6 ------                                  
   trunk/boost/format/feed_args.hpp                  |     7 +++----                                 
   trunk/boost/format/parsing.hpp                    |     4 ----                                    
   4 files changed, 5 insertions(+), 18 deletions(-)

Modified: trunk/boost/format/detail/msvc_disambiguater.hpp
==============================================================================
--- trunk/boost/format/detail/msvc_disambiguater.hpp	Sun Sep 29 20:21:39 2013	(r86039)
+++ trunk/boost/format/detail/msvc_disambiguater.hpp	2013-09-29 20:21:57 EDT (Sun, 29 Sep 2013)	(r86040)
@@ -14,9 +14,7 @@
 #ifndef BOOST_MSVC_DISAMBIGUATER_HPP
 #define BOOST_MSVC_DISAMBIGUATER_HPP
 
-#if BOOST_WORKAROUND( BOOST_MSVC, <= 1300) || \
-    BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
-   // this whole header is specifically for msvc up to 7.0
+#if BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
 
 #include <boost/format/group.hpp>
 #include <ostream>
@@ -51,6 +49,6 @@
 } // namespace io
 } // namespace boost
 
-#endif // -BOOST_MSVC
+#endif // -__DECCXX_VER
 
 #endif // -BOOST_MSVC_DISAMBIGUATER_HPP

Modified: trunk/boost/format/detail/workarounds_stlport.hpp
==============================================================================
--- trunk/boost/format/detail/workarounds_stlport.hpp	Sun Sep 29 20:21:39 2013	(r86039)
+++ trunk/boost/format/detail/workarounds_stlport.hpp	2013-09-29 20:21:57 EDT (Sun, 29 Sep 2013)	(r86040)
@@ -13,12 +13,6 @@
 #ifndef BOOST_MACROS_STLPORT_HPP
 #define BOOST_MACROS_STLPORT_HPP
 
-#if defined(_STLPORT_VERSION) && BOOST_WORKAROUND( BOOST_MSVC, <= 1300)
-// msvc-6-stlport fails to find basic_string::append( iterator, iterator) when linking
-// might affect other MSwindows compilers 
-#define BOOST_NO_STRING_APPEND
-#endif
-
 // *** This should go to "boost/config/stdlib/stlport.hpp".
 
 // If the streams are not native and there are problems with using templates

Modified: trunk/boost/format/feed_args.hpp
==============================================================================
--- trunk/boost/format/feed_args.hpp	Sun Sep 29 20:21:39 2013	(r86039)
+++ trunk/boost/format/feed_args.hpp	2013-09-29 20:21:57 EDT (Sun, 29 Sep 2013)	(r86040)
@@ -70,9 +70,8 @@
     } // -mk_str(..) 
 
 
-#if BOOST_WORKAROUND( BOOST_MSVC, <= 1300) || \
-    BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
-// MSVC needs to be tricked to disambiguate this simple overload..
+#if BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
+// __DECCXX needs to be tricked to disambiguate this simple overload..
 // the trick is in "boost/format/msvc_disambiguater.hpp"
   
     template< class Ch, class Tr, class T> inline
@@ -115,7 +114,7 @@
         os << x ;
     }
 #endif
-#endif  // -msvc workaround
+#endif  // -__DECCXX workaround
 
     template< class Ch, class Tr, class T>
     void call_put_head(BOOST_IO_STD basic_ostream<Ch, Tr> & os, const void* x) {

Modified: trunk/boost/format/parsing.hpp
==============================================================================
--- trunk/boost/format/parsing.hpp	Sun Sep 29 20:21:39 2013	(r86039)
+++ trunk/boost/format/parsing.hpp	2013-09-29 20:21:57 EDT (Sun, 29 Sep 2013)	(r86040)
@@ -390,11 +390,7 @@
     void append_string(String& dst, const String& src, 
                        const typename String::size_type beg, 
                        const typename String::size_type end) {
-#if !defined(BOOST_NO_STRING_APPEND)
         dst.append(src.begin()+beg, src.begin()+end);
-#else
-        dst += src.substr(beg, end-beg);
-#endif
     }
 
 } // detail namespace