[Boost-commit] svn:boost r78573 - in branches/release: boost boost/bimap boost/bimap/detail boost/bimap/relation boost/bimap/relation/detail boost/bimap/views libs/bimap

Subject: [Boost-commit] svn:boost r78573 - in branches/release: boost boost/bimap boost/bimap/detail boost/bimap/relation boost/bimap/relation/detail boost/bimap/views libs/bimap
From: matias.capeletto_at_[hidden]
Date: 2012-05-24 04:31:47

Author: matias
Date: 2012-05-24 04:31:45 EDT (Thu, 24 May 2012)
New Revision: 78573
URL: http://svn.boost.org/trac/boost/changeset/78573

Log:
[Bimap] Merge to release ( [78154] Fix #3868, [78159] Fix #5749 )
Properties modified: 
   branches/release/boost/bimap/   (props changed)
   branches/release/boost/bimap.hpp   (props changed)
   branches/release/libs/bimap/   (props changed)
Text files modified: 
   branches/release/boost/bimap/detail/map_view_iterator.hpp     |     6 +++++-                                  
   branches/release/boost/bimap/detail/set_view_iterator.hpp     |     6 +++++-                                  
   branches/release/boost/bimap/relation/detail/mutant.hpp       |     2 +-                                      
   branches/release/boost/bimap/relation/mutant_relation.hpp     |     5 ++++-                                   
   branches/release/boost/bimap/views/unconstrained_map_view.hpp |     2 +-                                      
   branches/release/boost/bimap/views/unconstrained_set_view.hpp |     2 +-                                      
   6 files changed, 17 insertions(+), 6 deletions(-)

Modified: branches/release/boost/bimap/detail/map_view_iterator.hpp
==============================================================================
--- branches/release/boost/bimap/detail/map_view_iterator.hpp	(original)
+++ branches/release/boost/bimap/detail/map_view_iterator.hpp	2012-05-24 04:31:45 EDT (Thu, 24 May 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: branches/release/boost/bimap/detail/set_view_iterator.hpp
==============================================================================
--- branches/release/boost/bimap/detail/set_view_iterator.hpp	(original)
+++ branches/release/boost/bimap/detail/set_view_iterator.hpp	2012-05-24 04:31:45 EDT (Thu, 24 May 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: branches/release/boost/bimap/relation/detail/mutant.hpp
==============================================================================
--- branches/release/boost/bimap/relation/detail/mutant.hpp	(original)
+++ branches/release/boost/bimap/relation/detail/mutant.hpp	2012-05-24 04:31:45 EDT (Thu, 24 May 2012)
@@ -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>
 

Modified: branches/release/boost/bimap/relation/mutant_relation.hpp
==============================================================================
--- branches/release/boost/bimap/relation/mutant_relation.hpp	(original)
+++ branches/release/boost/bimap/relation/mutant_relation.hpp	2012-05-24 04:31:45 EDT (Thu, 24 May 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>
 

Modified: branches/release/boost/bimap/views/unconstrained_map_view.hpp
==============================================================================
--- branches/release/boost/bimap/views/unconstrained_map_view.hpp	(original)
+++ branches/release/boost/bimap/views/unconstrained_map_view.hpp	2012-05-24 04:31:45 EDT (Thu, 24 May 2012)
@@ -29,7 +29,7 @@
 {
     public:
     template< class T >
-    unconstrained_map_view(const T & t) {}
+    unconstrained_map_view(const T &) {}
 
     typedef void reference;
     typedef void const_reference;

Modified: branches/release/boost/bimap/views/unconstrained_set_view.hpp
==============================================================================
--- branches/release/boost/bimap/views/unconstrained_set_view.hpp	(original)
+++ branches/release/boost/bimap/views/unconstrained_set_view.hpp	2012-05-24 04:31:45 EDT (Thu, 24 May 2012)
@@ -29,7 +29,7 @@
 {
     public:
     template< class T >
-    unconstrained_set_view(const T & t) {}
+    unconstrained_set_view(const T &) {}
 
     typedef void iterator;
     typedef void const_iterator;