[Boost-commit] svn:boost r85933 - in trunk/boost/wave: . util

Subject: [Boost-commit] svn:boost r85933 - in trunk/boost/wave: . util
From: steveire_at_[hidden]
Date: 2013-09-26 05:41:18

Author: skelly
Date: 2013-09-26 05:41:18 EDT (Thu, 26 Sep 2013)
New Revision: 85933
URL: http://svn.boost.org/trac/boost/changeset/85933

Log:
Wave: Remove obsolete MSVC version checks.

Text files modified: 
   trunk/boost/wave/util/cpp_include_paths.hpp |     3 +--                                     
   trunk/boost/wave/wave_config.hpp            |     5 ++---                                   
   2 files changed, 3 insertions(+), 5 deletions(-)

Modified: trunk/boost/wave/util/cpp_include_paths.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_include_paths.hpp	Thu Sep 26 05:41:00 2013	(r85932)
+++ trunk/boost/wave/util/cpp_include_paths.hpp	2013-09-26 05:41:18 EDT (Thu, 26 Sep 2013)	(r85933)
@@ -58,8 +58,7 @@
     typedef std::pair<FromType, ToType> value_type;
 
 #if defined(BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS) || \
-    (defined(BOOST_MSVC) && \
-        ( (BOOST_MSVC < 1300) || (BOOST_MSVC == 1600) )) || \
+    (defined(BOOST_MSVC) && (BOOST_MSVC == 1600) ) || \
     (defined(BOOST_INTEL_CXX_VERSION) && \
         (defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 700))) 
 

Modified: trunk/boost/wave/wave_config.hpp
==============================================================================
--- trunk/boost/wave/wave_config.hpp	Thu Sep 26 05:41:00 2013	(r85932)
+++ trunk/boost/wave/wave_config.hpp	2013-09-26 05:41:18 EDT (Thu, 26 Sep 2013)	(r85933)
@@ -202,8 +202,7 @@
 // VC7 isn't able to compile the flex_string class, fall back to std::string 
 // CW up to 8.3 chokes as well *sigh*
 // Tru64/CXX has linker problems when using flex_string
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || \
-    BOOST_WORKAROUND(__MWERKS__, < 0x3200) || \
+#if BOOST_WORKAROUND(__MWERKS__, < 0x3200) || \
     (defined(__DECCXX) && defined(__alpha)) || \
     defined(BOOST_WAVE_STRINGTYPE_USE_STDSTRING) 
 
@@ -228,7 +227,7 @@
 //  BOOST_WAVE_STRINGTYPE above.
 #include <boost/wave/util/flex_string.hpp>
 
-#endif // BOOST_WORKAROUND(_MSC_VER, <= 1300) et.al.
+#endif // BOOST_WORKAROUND(__MWERKS__, < 0x3200) et.al.
 #endif // !defined(BOOST_WAVE_STRINGTYPE)
 
 ///////////////////////////////////////////////////////////////////////////////