[Boost-cvs] CVS: boost/boost/wave/cpplexer/re2clex aq.hpp, 1.4, 1.4.2.1 cpp_re.hpp, 1.4, 1.4.2.1 cpp_re2c_lexer.hpp, 1.24.2.2, 1.24.2.3 scanner.hpp, 1.9, 1.9.2.1

[Hartmut Kaiser]

Update of /cvsroot/boost/boost/boost/wave/cpplexer/re2clex
In directory 
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28554/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 SunPro issue.

Index: aq.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/cpplexer/re2clex/aq.hpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- aq.hpp      24 Dec 2005 19:50:43 -0000      1.4
+++ aq.hpp      4 Jul 2006 20:03:21 -0000       1.4.2.1
@@ -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.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- cpp_re.hpp  24 Dec 2005 19:50:43 -0000      1.4
+++ cpp_re.hpp  4 Jul 2006 20:03:23 -0000       1.4.2.1
@@ -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.24.2.2
retrieving revision 1.24.2.3
diff -u -d -r1.24.2.2 -r1.24.2.3
--- cpp_re2c_lexer.hpp  29 Jun 2006 23:25:10 -0000      1.24.2.2
+++ cpp_re2c_lexer.hpp  4 Jul 2006 20:03:23 -0000       1.24.2.3
@@ -50,7 +50,9 @@
 namespace boost {
 namespace wave {
 namespace cpplexer {
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 namespace re2clex {
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // 
@@ -142,7 +144,7 @@
 inline
 lexer<IteratorT, PositionT>::~lexer() 
 {
-    using namespace std;        // some systems have memset in std
+    using namespace std;        // some systems have free in std
     aq_terminate(scanner.eol_offsets);
     free(scanner.bot);
 }
@@ -341,7 +343,9 @@
     lexer<IteratorT, PositionT>::cache = 
         token_cache<typename lexer<IteratorT, PositionT>::string_type>();
     
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 }   // namespace re2clex
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //  
@@ -383,7 +387,9 @@
     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
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- scanner.hpp 23 Jan 2006 03:45:34 -0000      1.9
+++ scanner.hpp 4 Jul 2006 20:03:23 -0000       1.9.2.1
@@ -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;
@@ -58,7 +60,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