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

From: hartmut.kaiser_at_[hidden]
Date: 2008-03-07 17:53:14

Author: hkaiser
Date: 2008-03-07 17:53:13 EST (Fri, 07 Mar 2008)
New Revision: 43542
URL: http://svn.boost.org/trac/boost/changeset/43542

Log:
Wave: Applied a workaround for Intel compilers and for Pathscale.
Text files modified: 
   trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp       |     2 +-                                      
   trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp |     3 +--                                     
   2 files changed, 2 insertions(+), 3 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-03-07 17:53:13 EST (Fri, 07 Mar 2008)
@@ -61,7 +61,7 @@
             position_type const &pos, boost::wave::language_support language)
     :   functor_ptr(lex_input_interface_generator<TokenT>
             ::new_lexer(first, last, pos, language)) 
-#if 0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900
+#if 0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || defined(__PGI)
       , eof()
 #endif // 0 != __DECCXX_VER
     {}

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-03-07 17:53:13 EST (Fri, 07 Mar 2008)
@@ -18,7 +18,6 @@
 
 #include <boost/assert.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/spirit/iterator/multi_pass.hpp>
 
 #include <boost/wave/language_support.hpp>
@@ -56,7 +55,7 @@
             boost::wave::language_support language)
     :   functor_ptr(slex_input_interface<TokenT>
             ::new_lexer(first, last, pos, language)) 
-#if 0 != __DECCXX_VER || BOOST_WORKAROUND(BOOST_INTEL_LINUX, == 1010)
+#if 0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || defined(__PGI)
       , eof()
 #endif // 0 != __DECCXX_VER
     {}