X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=boost_ext%2Fboost%2Fbimap%2Fbimap.hpp;h=e24b72939afde9fa6f6a7cd5efb844cc7de85558;hb=dbacfefe277bd5a1ff81e4e75448e2789da27e1b;hp=9af5cbfbc2ee45de2490f5cbc0db62bf739b209b;hpb=2f115c1368fe2bbd683ef4f806cf5b85166214a4;p=senf.git

diff --git a/boost_ext/boost/bimap/bimap.hpp b/boost_ext/boost/bimap/bimap.hpp
index 9af5cbf..e24b729 100644
--- a/boost_ext/boost/bimap/bimap.hpp
+++ b/boost_ext/boost/bimap/bimap.hpp
@@ -54,7 +54,9 @@ the next step will be:
 #include <boost/mpl/aux_/na.hpp>
 
 #define BOOST_BIMAP_DISABLE_SERIALIZATION
-#define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+#ifndef BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+#define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION 1
+#endif
 
 #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
     #include <boost/serialization/nvp.hpp>
@@ -151,7 +153,7 @@ class bimap
             ::boost::bimaps::detail::bimap_core<KeyTypeA,KeyTypeB,AP1,AP2,AP3>
         >::type
     >,
-    public ::boost::bimaps::detail::right_map_view_extra_typedefs< 
+    public ::boost::bimaps::detail::right_map_view_extra_typedefs<
         BOOST_DEDUCED_TYPENAME ::boost::bimaps::detail::right_map_view_type<
             ::boost::bimaps::detail::bimap_core<KeyTypeA,KeyTypeB,AP1,AP2,AP3>
         >::type
@@ -209,8 +211,8 @@ class bimap
 
         base_::relation_set(
             ::boost::multi_index::get<
-                BOOST_DEDUCED_TYPENAME base_::logic_relation_set_tag 
-            >(core) 
+                BOOST_DEDUCED_TYPENAME base_::logic_relation_set_tag
+            >(core)
         ),
         left (
             ::boost::multi_index::get<
@@ -219,7 +221,7 @@ class bimap
         ),
         right (
             ::boost::multi_index::get<
-                BOOST_DEDUCED_TYPENAME base_::logic_right_tag 
+                BOOST_DEDUCED_TYPENAME base_::logic_right_tag
             >(core)
         )
 
@@ -231,7 +233,7 @@ class bimap
         base_::relation_set(
             ::boost::multi_index::get<
                 BOOST_DEDUCED_TYPENAME base_::logic_relation_set_tag
-            >(core) 
+            >(core)
         ),
 
         core(first,last),
@@ -254,7 +256,7 @@ class bimap
         base_::relation_set(
             ::boost::multi_index::get<
                 BOOST_DEDUCED_TYPENAME base_::logic_relation_set_tag
-            >(core) 
+            >(core)
         ),
 
         core(x.core),