[Boost-cvs] CVS: boost/boost/wave/cpplexer/re2clex aq.hpp, 1.4.2.1, 1.4.2.2 cpp_re.hpp, 1.4.2.1, 1.4.2.2 cpp_re2c_lexer.hpp, 1.24.2.3, 1.24.2.4 scanner.hpp, 1.9.2.1, 1.9.2.2

[Hartmut Kaiser]

Update of /cvsroot/boost/boost/boost/wave/cpplexer/re2clex
In directory 
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2690/boost/wave/cpplexer/re2clex

Modified Files:
      Tag: RC_1_34_0
        aq.hpp cpp_re.hpp cpp_re2c_lexer.hpp scanner.hpp 
Log Message:
Another try to fix the Wave related SunPro compilation problem.

Index: aq.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/aq.hpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- aq.hpp      4 Jul 2006 20:03:21 -0000       1.4.2.1
+++ aq.hpp      26 Jul 2006 01:41:36 -0000      1.4.2.2
@@ -24,9 +24,7 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
-#endif
 
 typedef std::size_t aq_stdelement;
 
@@ -53,9 +51,7 @@
 BOOST_WAVE_DECL void aq_terminate(aq_queue q);
 
 ///////////////////////////////////////////////////////////////////////////////
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
-#endif
 }   // namespace cpplexer
 }   // namespace wave
 }   // namespace boost 

Index: cpp_re.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/cpp_re.hpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- cpp_re.hpp  4 Jul 2006 20:03:23 -0000       1.4.2.1
+++ cpp_re.hpp  26 Jul 2006 01:41:36 -0000      1.4.2.2
@@ -31,18 +31,14 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //  The scanner function to call whenever a new token is requested
 BOOST_WAVE_DECL boost::wave::token_id scan(Scanner *s);
 
 ///////////////////////////////////////////////////////////////////////////////
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
-#endif
 }   // namespace cpplexer
 }   // namespace wave
 }   // namespace boost

Index: cpp_re2c_lexer.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -d -r1.24.2.3 -r1.24.2.4
--- cpp_re2c_lexer.hpp  4 Jul 2006 20:03:23 -0000       1.24.2.3
+++ cpp_re2c_lexer.hpp  26 Jul 2006 01:41:37 -0000      1.24.2.4
@@ -50,9 +50,7 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // 
@@ -343,9 +341,7 @@
     lexer<IteratorT, PositionT>::cache = 
         token_cache<typename lexer<IteratorT, PositionT>::string_type>();
     
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //  
@@ -387,9 +383,7 @@
     IteratorT const &last, PositionT const &pos, 
     boost::wave::language_support language)
 {
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
     using re2clex::lex_functor;
-#endif
     return new lex_functor<IteratorT, PositionT>(first, last, pos, language);
 }
 

Index: scanner.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/scanner.hpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- scanner.hpp 4 Jul 2006 20:03:23 -0000       1.9.2.1
+++ scanner.hpp 26 Jul 2006 01:41:37 -0000      1.9.2.2
@@ -24,9 +24,7 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
-#endif
 
 struct Scanner;
 typedef unsigned char uchar;
@@ -60,9 +58,7 @@
 } Scanner;
 
 ///////////////////////////////////////////////////////////////////////////////
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
-#endif
 }   // namespace cpplexer
 }   // namespace wave
 }   // namespace boost


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
Boost-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/boost-cvs