[Boost-commit] svn:boost r44602 - in trunk: boost/wave/cpplexer libs/wave/samples/cpp_tokens libs/wave/samples/list_includes

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-19 16:00:00

Author: hkaiser
Date: 2008-04-19 15:59:59 EDT (Sat, 19 Apr 2008)
New Revision: 44602
URL: http://svn.boost.org/trac/boost/changeset/44602

Log:
Wave: fixing compilation using Intel compilers
Text files modified: 
   trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp             |     2 +-                                      
   trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp       |     2 +-                                      
   trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp |     6 +++---                                  
   3 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp	(original)
+++ trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp	2008-04-19 15:59:59 EDT (Sat, 19 Apr 2008)
@@ -57,7 +57,7 @@
 
 public:
     lex_iterator_functor_shim() 
-#if 0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || defined(__PGI)
+#if 0 != __DECCXX_VER || defined(__PGI)
       : eof()
 #endif
     {}

Modified: trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp	(original)
+++ trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp	2008-04-19 15:59:59 EDT (Sat, 19 Apr 2008)
@@ -52,7 +52,7 @@
 
 public:
     slex_iterator_functor_shim()
-#if 0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || defined(__PGI)
+#if 0 != __DECCXX_VER || defined(__PGI)
       : eof()
 #endif // 0 != __DECCXX_VER
     {}

Modified: trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp
==============================================================================
--- trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp	(original)
+++ trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp	2008-04-19 15:59:59 EDT (Sat, 19 Apr 2008)
@@ -25,7 +25,7 @@
 
 #include "lexertl_interface.hpp"
 
-#if 0 != __COMO_VERSION__
+#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
 #define BOOST_WAVE_EOF_PREFIX static
 #else
 #define BOOST_WAVE_EOF_PREFIX 
@@ -54,7 +54,7 @@
             wave::language_support language)
     :   functor_ptr(lexertl_input_interface<TokenT>
             ::new_lexer(first, last, pos, language)) 
-#if 0 != __DECCXX_VER
+#if 0 != __DECCXX_VER || defined(__PGI)
       , eof()
 #endif // 0 != __DECCXX_VER
     {}
@@ -88,7 +88,7 @@
     boost::shared_ptr<lex_input_interface<TokenT> > functor_ptr;
 };
 
-#if 0 != __COMO_VERSION__
+#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
 ///////////////////////////////////////////////////////////////////////////////
 //  eof token
 template <typename TokenT>