[Boost-cvs] CVS: boost/boost/wave/cpplexer/re2clex aq.hpp, 1.4, 1.5 cpp_re.hpp, 1.4, 1.5 cpp_re2c_lexer.hpp, 1.27, 1.28 scanner.hpp, 1.10, 1.11

[Hartmut Kaiser]

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

Modified Files:
        aq.hpp cpp_re.hpp cpp_re2c_lexer.hpp scanner.hpp 
Log Message:
Another try to fix the SunPro issue.

Index: aq.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/aq.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aq.hpp      24 Dec 2005 19:50:43 -0000      1.4
+++ aq.hpp      4 Jul 2006 20:04:26 -0000       1.5
@@ -24,7 +24,9 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
+#endif
 
 typedef std::size_t aq_stdelement;
 
@@ -51,7 +53,9 @@
 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
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cpp_re.hpp  24 Dec 2005 19:50:43 -0000      1.4
+++ cpp_re.hpp  4 Jul 2006 20:04:26 -0000       1.5
@@ -31,14 +31,18 @@
 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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cpp_re2c_lexer.hpp  17 Jun 2006 19:43:40 -0000      1.27
+++ cpp_re2c_lexer.hpp  4 Jul 2006 20:04:26 -0000       1.28
@@ -50,7 +50,9 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // 
@@ -347,7 +349,9 @@
     lexer<IteratorT, PositionT>::cache = 
         token_cache<typename lexer<IteratorT, PositionT>::string_type>();
     
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //  
@@ -389,8 +393,10 @@
     IteratorT const &last, PositionT const &pos, 
     boost::wave::language_support language)
 {
-    return new re2clex::lex_functor<IteratorT, PositionT>(first, last, pos,
-        language);
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
+    using re2clex::lex_functor;
+#endif
+    return new lex_functor<IteratorT, PositionT>(first, last, pos, language);
 }
 
 #undef BOOST_WAVE_RE2C_NEW_LEXER_INLINE

Index: scanner.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/scanner.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scanner.hpp 15 Jun 2006 22:01:08 -0000      1.10
+++ scanner.hpp 4 Jul 2006 20:04:26 -0000       1.11
@@ -24,7 +24,9 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
+#endif
 
 struct Scanner;
 typedef unsigned char uchar;
@@ -59,7 +61,9 @@
 } Scanner;
 
 ///////////////////////////////////////////////////////////////////////////////
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
+#endif
 }   // namespace cpplexer
 }   // namespace wave
 }   // namespace boost


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
Boost-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/boost-cvs