Boost logo

Boost-Commit :

From: hartmut.kaiser_at_[hidden]
Date: 2008-07-17 21:41:54


Author: hkaiser
Date: 2008-07-17 21:41:53 EDT (Thu, 17 Jul 2008)
New Revision: 47532
URL: http://svn.boost.org/trac/boost/changeset/47532

Log:
Spirit.Lex: fixing regressions
Text files modified:
   branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp | 10 +++++++++-
   branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp | 10 +++++++++-
   2 files changed, 18 insertions(+), 2 deletions(-)

Modified: branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp
==============================================================================
--- branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp (original)
+++ branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp 2008-07-17 21:41:53 EDT (Thu, 17 Jul 2008)
@@ -250,7 +250,15 @@
           : eof()
 #endif
         {}
-
+
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
+ // somehow VC7.1 needs this (meaningless) assignment operator
+ lexertl_functor& operator=(lexertl_functor const& rhs)
+ {
+ return *this;
+ }
+#endif
+
         ///////////////////////////////////////////////////////////////////////
         // interface to the multi_pass_policies::split_functor_input policy
         typedef Token result_type;

Modified: branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp
==============================================================================
--- branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp (original)
+++ branches/release/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp 2008-07-17 21:41:53 EDT (Thu, 17 Jul 2008)
@@ -245,7 +245,15 @@
           : eof()
 #endif
         {}
-
+
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
+ // somehow VC7.1 needs this (meaningless) assignment operator
+ lexertl_functor& operator=(lexertl_functor const& rhs)
+ {
+ return *this;
+ }
+#endif
+
         ///////////////////////////////////////////////////////////////////////
         // interface to the multi_pass_policies::split_functor_input policy
         typedef Token result_type;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk