Changeset 44652


Ignore:
Timestamp:
Apr 20, 2008, 9:27:28 PM (10 years ago)
Author:
Hartmut Kaiser
Message:

Spirit.Lex: Fixed VC7.1 compilation issue

Location:
trunk/boost/spirit/home/lex/lexer/lexertl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp

    r44608 r44652  
    2424
    2525#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
     26#define BOOST_SPIRIT_STATIC_EOF 1
    2627#define BOOST_SPIRIT_EOF_PREFIX static
    2728#else
     
    266267            shared& data = mp.shared->ftor;
    267268            if (data.first == data.last)
     269#if defined(BOOST_SPIRIT_STATIC_EOF)
    268270                return result = eof;
     271#else
     272                return result = mp.ftor.eof;
     273#endif
    269274
    270275            Iterator end = data.first;
     
    284289            }
    285290            else if (0 == id) {         // EOF reached
     291#if defined(BOOST_SPIRIT_STATIC_EOF)
    286292                result = eof;
     293#else
     294                result = mp.ftor.eof;
     295#endif
    287296            }
    288297            else {
     
    367376
    368377#undef BOOST_SPIRIT_EOF_PREFIX
    369 
    370 #endif
     378#undef BOOST_SPIRIT_STATIC_EOF
     379
     380#endif
  • trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_iterator.hpp

    r44358 r44652  
    5555       
    5656        typedef multi_pass_policies::default_policy<
    57                 input_policy, ownership_policy, check_policy, storage_policy>
     57                ownership_policy, check_policy, input_policy, storage_policy>
    5858            policy_type;
    5959        typedef spirit::multi_pass<functor_data_type, policy_type> type;
  • trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp

    r44608 r44652  
    2323
    2424#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
     25#define BOOST_SPIRIT_STATIC_EOF 1
    2526#define BOOST_SPIRIT_EOF_PREFIX static
    2627#else
     
    260261            shared& data = mp.shared->ftor;
    261262            if (data.first == data.last)
     263#if defined(BOOST_SPIRIT_STATIC_EOF)
    262264                return result = eof;
     265#else
     266                return result = mp.ftor.eof;
     267#endif
    263268
    264269            Iterator end = data.first;
     
    278283            }
    279284            else if (0 == id) {         // EOF reached
     285#if defined(BOOST_SPIRIT_STATIC_EOF)
    280286                return result = eof;
     287#else
     288                return result = mp.ftor.eof;
     289#endif
    281290            }
    282291           
     
    352361
    353362#undef BOOST_SPIRIT_EOF_PREFIX
    354 
    355 #endif
     363#undef BOOST_SPIRIT_STATIC_EOF
     364
     365#endif
Note: See TracChangeset for help on using the changeset viewer.