Ticket #2418: serialization.diff

File serialization.diff, 1.5 KB (added by Jürgen Hunold, 14 years ago)

serialization.diff

  • boost/archive/impl/basic_xml_grammar.hpp

     
    6565#endif
    6666
    6767// spirit stuff
    68 #if (defined __BORLANDC__) && (__BORLANDC__ < 0x593) \
    69 || (defined _MSC_VER) && #if (_MSC_VER <= 1300)
    70 #else
    71 #include <boost/spirit/classic_chset.hpp>
    72 #endif
     68#include <boost/spirit/include/classic_chset.hpp>
    7369
    7470#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
    7571#undef arg

  • libs/serialization/src/basic_xml_grammar.ipp

     
    1717#include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME
    1818
    1919// spirit stuff
    20 #if (defined __BORLANDC__) && (__BORLANDC__ < 0x593) \
    21 || (defined _MSC_VER) && #if (_MSC_VER <= 1300)
    22 #include <boost/spirit/core/composite/operators.hpp>
    23 #include <boost/spirit/core/composite/actions.hpp>
    24 #include <boost/spirit/core/primitives/numerics.hpp>
    25 #else
    26 #include <boost/spirit/classic_operators.hpp>
    27 #include <boost/spirit/classic_actions.hpp>
    28 #include <boost/spirit/classic_numerics.hpp>
    29 #endif
     20#include <boost/spirit/include/classic_operators.hpp>
     21#include <boost/spirit/include/classic_actions.hpp>
     22#include <boost/spirit/include/classic_numerics.hpp>
    3023
    3124// for head_iterator test
    3225//#include <boost/bind.hpp>