12 files changed, 23 insertions, 6 deletions
diff --git a/boost/bimap/container_adaptor/list_map_adaptor.hpp b/boost/bimap/container_adaptor/list_map_adaptor.hpp
index ff7a5407af..e4fd52df79 100644
--- a/boost/bimap/container_adaptor/list_map_adaptor.hpp
+++ b/boost/bimap/container_adaptor/list_map_adaptor.hpp
@@ -134,6 +134,7 @@ class list_map_adaptor :
 
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::first_type  key_type;
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::second_type data_type;
+    typedef data_type mapped_type;
 
     protected:
 
diff --git a/boost/bimap/container_adaptor/map_adaptor.hpp b/boost/bimap/container_adaptor/map_adaptor.hpp
index f1a6f64d2d..3df1a03cb0 100644
--- a/boost/bimap/container_adaptor/map_adaptor.hpp
+++ b/boost/bimap/container_adaptor/map_adaptor.hpp
@@ -82,6 +82,7 @@ class map_adaptor :
     public:
 
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::second_type data_type;
+    typedef data_type mapped_type;
 
     // Access -----------------------------------------------------------------
 
diff --git a/boost/bimap/container_adaptor/multimap_adaptor.hpp b/boost/bimap/container_adaptor/multimap_adaptor.hpp
index ad5edf2bb9..f39899ea0c 100644
--- a/boost/bimap/container_adaptor/multimap_adaptor.hpp
+++ b/boost/bimap/container_adaptor/multimap_adaptor.hpp
@@ -81,6 +81,7 @@ class multimap_adaptor :
     public:
 
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::second_type data_type;
+    typedef data_type mapped_type;
 
     // Access -----------------------------------------------------------------
 
diff --git a/boost/bimap/container_adaptor/unordered_map_adaptor.hpp b/boost/bimap/container_adaptor/unordered_map_adaptor.hpp
index 762a643c27..fd233e8e22 100644
--- a/boost/bimap/container_adaptor/unordered_map_adaptor.hpp
+++ b/boost/bimap/container_adaptor/unordered_map_adaptor.hpp
@@ -82,6 +82,7 @@ class unordered_map_adaptor :
     public:
 
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::second_type data_type;
+    typedef data_type mapped_type;
 
     // Access -----------------------------------------------------------------
 
diff --git a/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp b/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp
index be28b3adf3..104d197963 100644
--- a/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp
+++ b/boost/bimap/container_adaptor/unordered_multimap_adaptor.hpp
@@ -81,6 +81,7 @@ class unordered_multimap_adaptor :
     public:
 
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::second_type data_type;
+    typedef data_type mapped_type;
 
     // Access -----------------------------------------------------------------
 
diff --git a/boost/bimap/container_adaptor/vector_map_adaptor.hpp b/boost/bimap/container_adaptor/vector_map_adaptor.hpp
index 9b0b9d3df5..1d49ac7c6e 100644
--- a/boost/bimap/container_adaptor/vector_map_adaptor.hpp
+++ b/boost/bimap/container_adaptor/vector_map_adaptor.hpp
@@ -77,6 +77,7 @@ class vector_map_adaptor :
 
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::first_type  key_type;
     typedef BOOST_DEDUCED_TYPENAME Iterator::value_type::second_type data_type;
+    typedef data_type mapped_type;
 
     // Access -----------------------------------------------------------------
 
diff --git a/boost/bimap/detail/map_view_iterator.hpp b/boost/bimap/detail/map_view_iterator.hpp
index adc8d7c861..4f0e20e00a 100644
--- a/boost/bimap/detail/map_view_iterator.hpp
+++ b/boost/bimap/detail/map_view_iterator.hpp
@@ -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>
diff --git a/boost/bimap/detail/set_view_iterator.hpp b/boost/bimap/detail/set_view_iterator.hpp
index 57e6ae3c8b..d48f5c05b1 100644
--- a/boost/bimap/detail/set_view_iterator.hpp
+++ b/boost/bimap/detail/set_view_iterator.hpp
@@ -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>
diff --git a/boost/bimap/relation/detail/mutant.hpp b/boost/bimap/relation/detail/mutant.hpp
index 62b3843bb1..8a2ffdeba0 100644
--- a/boost/bimap/relation/detail/mutant.hpp
+++ b/boost/bimap/relation/detail/mutant.hpp
@@ -21,9 +21,9 @@
 #include <boost/bimap/detail/debug/static_error.hpp>
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/assert.hpp>
-#include <boost/utility.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_const.hpp>
+#include <boost/utility/addressof.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/utility/enable_if.hpp>
 
diff --git a/boost/bimap/relation/mutant_relation.hpp b/boost/bimap/relation/mutant_relation.hpp
index c46ab790a9..9aa28e4cac 100644
--- a/boost/bimap/relation/mutant_relation.hpp
+++ b/boost/bimap/relation/mutant_relation.hpp
@@ -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>
 
diff --git a/boost/bimap/views/unconstrained_map_view.hpp b/boost/bimap/views/unconstrained_map_view.hpp
index da9b4b47af..ce47541e48 100644
--- a/boost/bimap/views/unconstrained_map_view.hpp
+++ b/boost/bimap/views/unconstrained_map_view.hpp
@@ -29,7 +29,7 @@ class unconstrained_map_view
 {
     public:
     template< class T >
-    unconstrained_map_view(const T & t) {}
+    unconstrained_map_view(const T &) {}
 
     typedef void reference;
     typedef void const_reference;
diff --git a/boost/bimap/views/unconstrained_set_view.hpp b/boost/bimap/views/unconstrained_set_view.hpp
index 6b4a6e220d..e4ada9d08c 100644
--- a/boost/bimap/views/unconstrained_set_view.hpp
+++ b/boost/bimap/views/unconstrained_set_view.hpp
@@ -29,7 +29,7 @@ class unconstrained_set_view
 {
     public:
     template< class T >
-    unconstrained_set_view(const T & t) {}
+    unconstrained_set_view(const T &) {}
 
     typedef void iterator;
     typedef void const_iterator;