X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=boost_ext%2Fboost%2Fmulti_index_container.hpp;fp=boost_ext%2Fboost%2Fmulti_index_container.hpp;h=856afc9718c661843c8aca28dcba7bb53a3463ca;hb=dbacfefe277bd5a1ff81e4e75448e2789da27e1b;hp=11a65977324fabb38bd648742c2833bf55a5bd28;hpb=2f115c1368fe2bbd683ef4f806cf5b85166214a4;p=senf.git diff --git a/boost_ext/boost/multi_index_container.hpp b/boost_ext/boost/multi_index_container.hpp index 11a6597..856afc9 100644 --- a/boost_ext/boost/multi_index_container.hpp +++ b/boost_ext/boost/multi_index_container.hpp @@ -15,6 +15,10 @@ #pragma once #endif +#ifndef BOOST_MULTI_INDEX_DISABLE_SERIALIZATION +#define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION 1 +#endif + #include /* keep it first to prevent nasty warns in MSVC */ #include #include @@ -46,7 +50,7 @@ #include #include #include -#include +#include #endif #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING) @@ -129,7 +133,7 @@ public: typedef typename super::ctor_args_list ctor_args_list; typedef IndexSpecifierList index_specifier_type_list; - + #if BOOST_WORKAROUND(BOOST_MSVC,<1300) /* MSVC++ 6.0 chokes on moderately long index lists (around 6 indices * or more), with errors ranging from corrupt exes to duplicate @@ -191,7 +195,7 @@ public: node_count(0) { BOOST_MULTI_INDEX_CHECK_INVARIANT; - } + } template multi_index_container( @@ -641,7 +645,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: { BOOST_MULTI_INDEX_CHECK_INVARIANT; - clear_(); + clear_(); std::size_t s; ar>>serialization::make_nvp("count",s);