[Boost-commit] svn:boost r78154 - in trunk/boost/bimap: detail relation

Subject: [Boost-commit] svn:boost r78154 - in trunk/boost/bimap: detail relation
From: matias.capeletto_at_[hidden]
Date: 2012-04-23 06:16:36

Author: matias
Date: 2012-04-23 06:16:34 EDT (Mon, 23 Apr 2012)
New Revision: 78154
URL: http://svn.boost.org/trac/boost/changeset/78154

Log:
[Bimap] Remove spurious dependency on Boost.Serialization (Fix #3868)
Text files modified: 
   trunk/boost/bimap/detail/map_view_iterator.hpp |     6 +++++-                                  
   trunk/boost/bimap/detail/set_view_iterator.hpp |     6 +++++-                                  
   trunk/boost/bimap/relation/mutant_relation.hpp |     5 ++++-                                   
   3 files changed, 14 insertions(+), 3 deletions(-)

Modified: trunk/boost/bimap/detail/map_view_iterator.hpp
==============================================================================
--- trunk/boost/bimap/detail/map_view_iterator.hpp	(original)
+++ trunk/boost/bimap/detail/map_view_iterator.hpp	2012-04-23 06:16:34 EDT (Mon, 23 Apr 2012)
@@ -19,7 +19,11 @@
 #include <boost/config.hpp>
 
 // Boost
-#include <boost/serialization/nvp.hpp>
+
+#ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
+  #include <boost/serialization/nvp.hpp>
+#endif // BOOST_BIMAP_DISABLE_SERIALIZATION
+
 #include <boost/iterator/detail/enable_if.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/bimap/relation/support/pair_by.hpp>

Modified: trunk/boost/bimap/detail/set_view_iterator.hpp
==============================================================================
--- trunk/boost/bimap/detail/set_view_iterator.hpp	(original)
+++ trunk/boost/bimap/detail/set_view_iterator.hpp	2012-04-23 06:16:34 EDT (Mon, 23 Apr 2012)
@@ -19,7 +19,11 @@
 #include <boost/config.hpp>
 
 // Boost
-#include <boost/serialization/nvp.hpp>
+
+#ifndef BOOST_BIMAP_DISABLE_SERIALIZATION 
+  #include <boost/serialization/nvp.hpp>
+#endif // BOOST_BIMAP_DISABLE_SERIALIZATION
+
 #include <boost/iterator/detail/enable_if.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/bimap/relation/support/get_pair_functor.hpp>

Modified: trunk/boost/bimap/relation/mutant_relation.hpp
==============================================================================
--- trunk/boost/bimap/relation/mutant_relation.hpp	(original)
+++ trunk/boost/bimap/relation/mutant_relation.hpp	2012-04-23 06:16:34 EDT (Mon, 23 Apr 2012)
@@ -21,7 +21,10 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/operators.hpp>
 #include <boost/call_traits.hpp>
-#include <boost/serialization/nvp.hpp>
+
+#ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
+  #include <boost/serialization/nvp.hpp>
+#endif // BOOST_BIMAP_DISABLE_SERIALIZATION
 
 #include <boost/functional/hash/hash.hpp>