[Boost-commit] svn:boost r58871 - trunk/boost/spirit/home/lex/lexer/lexertl

Subject: [Boost-commit] svn:boost r58871 - trunk/boost/spirit/home/lex/lexer/lexertl
From: hartmut.kaiser_at_[hidden]
Date: 2010-01-10 11:11:58

Author: hkaiser
Date: 2010-01-10 11:11:58 EST (Sun, 10 Jan 2010)
New Revision: 58871
URL: http://svn.boost.org/trac/boost/changeset/58871

Log:
Spirit: modified conditions for workaround
Text files modified: 
   trunk/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp        |     7 ++-----                                 
   trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp |     7 ++-----                                 
   2 files changed, 4 insertions(+), 10 deletions(-)

Modified: trunk/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp	2010-01-10 11:11:58 EST (Sun, 10 Jan 2010)
@@ -62,12 +62,9 @@
             template <typename Char>
             void set_state_name (Char const*) 
             {
-// earlier versions of gcc (< 4.2.2) instantiate this function even if it's not 
+// some (random) versions of gcc instantiate this function even if it's not 
 // needed leading to false static asserts
-#if !(defined(__GNUC__) && ( \
-      (__GNUC__ < 4) || \
-      ((__GNUC__ == 4) && (__GNUC_MINOR__ < 2)) || \
-      ((__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && (__GNUC_PATCHLEVEL__ < 2))))
+#if !defined(__GNUC__)
                 // If you see a compile time assertion below you're probably 
                 // using a token type not supporting lexer states (the 3rd 
                 // template parameter of the token is mpl::false_), but your 

Modified: trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp	2010-01-10 11:11:58 EST (Sun, 10 Jan 2010)
@@ -78,12 +78,9 @@
             template <typename Char>
             void set_state_name (Char const*) 
             {
-// earlier versions of gcc (< 4.2.2) instantiate this function even if it's not 
+// some (random) versions of gcc instantiate this function even if it's not 
 // needed leading to false static asserts
-#if !(defined(__GNUC__) && ( \
-      (__GNUC__ < 4) || \
-      ((__GNUC__ == 4) && (__GNUC_MINOR__ < 2)) || \
-      ((__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && (__GNUC_PATCHLEVEL__ < 2))))
+#if !defined(__GNUC__)
                 // If you see a compile time assertion below you're probably 
                 // using a token type not supporting lexer states (the 3rd 
                 // template parameter of the token is mpl::false_), but your