Update bundled boost to 1.53.0

Modify our patches as necessary to match the updated boost sources. Drop
patches for which corresponding (or even identical) changes already are
present. Add a new boostsystem static library and use it in two places.

Change-Id: Ib59558feb56dab87a69c91b38caca8e7a9e9a22e

1 files changed, 0 insertions, 794 deletions

diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index d1224f65cbba..7a5726e032fd 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -72,20 +72,6 @@
              BOOST_ASSERT( first <= last && "out of range unique()/erase_if()" );
              BOOST_ASSERT( this->begin() <= first && "out of range unique()/erase_if()" );
              BOOST_ASSERT( last <= this->end() && "out of range unique()/erase_if)(" );             
---- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp	2010-04-07 02:41:42.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp	2011-02-04 16:39:19.000000000 +0100
-@@ -222,9 +222,9 @@
- 
-         error_status(
-             result_t result_ = fail,
--            std::ptrdiff_t length = -1,
-+            std::ptrdiff_t length_ = -1,
-             T const& value_ = T())
--        : result(result_), length(length), value(value_) {}
-+        : result(result_), length(length_), value(value_) {}
- 
-         result_t        result;
-         std::ptrdiff_t  length;
 --- misc/boost_1_44_0/boost/spirit/home/classic/symbols/symbols.hpp	2008-06-22 17:05:38.000000000 +0200
 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/symbols/symbols.hpp	2011-02-04 16:39:19.000000000 +0100
 @@ -102,13 +102,13 @@
@@ -106,563 +92,6 @@
                      first,
                      scan.first);
          else
---- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp	2011-02-04 16:39:19.000000000 +0100
-@@ -54,13 +54,13 @@
-             typedef typename ScannerT::iterator_t   iterator_t;
- 
-             iterator_t const s(scan.first);
--            functor_result_t result;
--            std::ptrdiff_t len = functor(scan, result);
-+            functor_result_t functor_result;
-+            std::ptrdiff_t len = functor(scan, functor_result);
- 
-             if (len < 0)
-                 return scan.no_match();
-             else
--                return scan.create_match(std::size_t(len), result, s, scan.first);
-+                return scan.create_match(std::size_t(len), functor_result, s, scan.first);
-         }
-     };
- 
---- misc/boost_1_44_0/boost/spirit/home/classic/utility/loops.hpp	2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/loops.hpp	2011-02-04 16:39:19.000000000 +0100
-@@ -47,8 +47,8 @@
-         typedef fixed_loop<ParserT, ExactT>     self_t;
-         typedef unary<ParserT, parser<self_t> >  base_t;
- 
--        fixed_loop (ParserT const & subject, ExactT const & exact)
--        : base_t(subject), m_exact(exact) {}
-+        fixed_loop (ParserT const & subject_, ExactT const & exact)
-+        : base_t(subject_), m_exact(exact) {}
- 
-         template <typename ScannerT>
-         typename parser_result <self_t, ScannerT>::type
-@@ -112,8 +112,8 @@
-         typedef finite_loop <ParserT, MinT, MaxT> self_t;
-         typedef unary<ParserT, parser<self_t> >   base_t;
- 
--        finite_loop (ParserT const & subject, MinT const & min, MaxT const & max)
--        : base_t(subject), m_min(min), m_max(max) {}
-+        finite_loop (ParserT const & subject_, MinT const & min, MaxT const & max)
-+        : base_t(subject_), m_min(min), m_max(max) {}
- 
-         template <typename ScannerT>
-         typename parser_result <self_t, ScannerT>::type
-@@ -196,11 +196,11 @@
-         typedef unary<ParserT, parser<self_t> > base_t;
- 
-         infinite_loop (
--            ParserT const& subject,
-+            ParserT const& subject_,
-             MinT const& min,
-             more_t const&
-         )
--        : base_t(subject), m_min(min) {}
-+        : base_t(subject_), m_min(min) {}
- 
-         template <typename ScannerT>
-         typename parser_result <self_t, ScannerT>::type
-@@ -253,9 +253,9 @@
- 
-         template <typename ParserT>
-         fixed_loop <ParserT, ExactT>
--        operator[](parser <ParserT> const & subject) const
-+        operator[](parser <ParserT> const & subject_) const
-         {
--            return fixed_loop <ParserT, ExactT> (subject.derived (), m_exact);
-+            return fixed_loop <ParserT, ExactT> (subject_.derived (), m_exact);
-         }
- 
-         ExactT m_exact;
-@@ -283,11 +283,11 @@
- 
-        template <typename ParserT>
-        typename impl::loop_traits<ParserT, MinT, MaxT>::type
--       operator[](parser <ParserT> const & subject) const
-+       operator[](parser <ParserT> const & subject_) const
-        {
-            typedef typename impl::loop_traits<ParserT, MinT, MaxT>::type ret_t;
-            return ret_t(
--                subject.derived(),
-+                subject_.derived(),
-                 m_min,
-                 m_max);
-        }
---- misc/boost_1_44_0/boost/unordered/detail/table.hpp	2011-02-04 16:55:26.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/unordered/detail/table.hpp	2011-02-05 03:34:26.000000000 +0100
-@@ -33,10 +33,10 @@
-     template <class T>
-     template <class Key, class Pred>
-     inline BOOST_DEDUCED_TYPENAME T::node_ptr
--        hash_table<T>::find_iterator(bucket_ptr bucket, Key const& k,
-+        hash_table<T>::find_iterator(bucket_ptr bucket_, Key const& k,
-             Pred const& eq) const
-     {
--        node_ptr it = bucket->next_;
-+        node_ptr it = bucket_->next_;
-         while (BOOST_UNORDERED_BORLAND_BOOL(it) &&
-             !eq(k, get_key(node::get_value(it))))
-         {
-@@ -50,9 +50,9 @@
-     template <class T>
-     inline BOOST_DEDUCED_TYPENAME T::node_ptr
-         hash_table<T>::find_iterator(
--            bucket_ptr bucket, key_type const& k) const
-+            bucket_ptr bucket_, key_type const& k) const
-     {
--        node_ptr it = bucket->next_;
-+        node_ptr it = bucket_->next_;
-         while (BOOST_UNORDERED_BORLAND_BOOL(it) &&
-             !equal(k, node::get_value(it)))
-         {
-@@ -75,9 +75,9 @@
-     template <class T>
-     inline BOOST_DEDUCED_TYPENAME T::node_ptr*
-         hash_table<T>::find_for_erase(
--            bucket_ptr bucket, key_type const& k) const
-+            bucket_ptr bucket_, key_type const& k) const
-     {
--        node_ptr* it = &bucket->next_;
-+        node_ptr* it = &bucket_->next_;
-         while(BOOST_UNORDERED_BORLAND_BOOL(*it) &&
-             !equal(k, node::get_value(*it)))
-         {
-@@ -475,7 +475,7 @@
-     {    
-         hasher const& hf = this->hash_function();
-         std::size_t size = this->size_;
--        bucket_ptr end = this->get_bucket(this->bucket_count_);
-+        bucket_ptr end_ = this->get_bucket(this->bucket_count_);
- 
-         buckets dst(this->node_alloc(), num_buckets);
-         dst.create_buckets();
-@@ -484,10 +484,10 @@
-         src.swap(*this);
-         this->size_ = 0;
- 
--        for(bucket_ptr bucket = this->cached_begin_bucket_;
--            bucket != end; ++bucket)
-+        for(bucket_ptr bucket_ = this->cached_begin_bucket_;
-+            bucket_ != end_; ++bucket_)
-         {
--            node_ptr group = bucket->next_;
-+            node_ptr group = bucket_->next_;
-             while(group) {
-                 // Move the first group of equivalent nodes in bucket to dst.
- 
-@@ -496,10 +496,10 @@
-                     hf(get_key_from_ptr(group)));
- 
-                 node_ptr& next_group = node::next_group(group);
--                bucket->next_ = next_group;
-+                bucket_->next_ = next_group;
-                 next_group = dst_bucket->next_;
-                 dst_bucket->next_ = group;
--                group = bucket->next_;
-+                group = bucket_->next_;
-             }
-         }
- 
-@@ -525,13 +525,13 @@
-         BOOST_ASSERT(this->buckets_ && !dst.buckets_);
- 
-         hasher const& hf = this->hash_function();
--        bucket_ptr end = this->get_bucket(this->bucket_count_);
-+        bucket_ptr end_ = this->get_bucket(this->bucket_count_);
- 
-         node_constructor a(dst);
-         dst.create_buckets();
- 
-         // no throw:
--        for(bucket_ptr i = this->cached_begin_bucket_; i != end; ++i) {
-+        for(bucket_ptr i = this->cached_begin_bucket_; i != end_; ++i) {
-             // no throw:
-             for(node_ptr it = i->next_; it;) {
-                 // hash function can throw.
-@@ -579,11 +579,11 @@
-     {
-         if(!this->size_) return this->end();
- 
--        bucket_ptr bucket = this->get_bucket(this->bucket_index(k));
--        node_ptr it = find_iterator(bucket, k);
-+        bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k));
-+        node_ptr it = find_iterator(bucket_, k);
- 
-         if (BOOST_UNORDERED_BORLAND_BOOL(it))
--            return iterator_base(bucket, it);
-+            return iterator_base(bucket_, it);
-         else
-             return this->end();
-     }
-@@ -595,11 +595,11 @@
-     {
-         if(!this->size_) return this->end();
- 
--        bucket_ptr bucket = this->get_bucket(h(k) % this->bucket_count_);
--        node_ptr it = find_iterator(bucket, k, eq);
-+        bucket_ptr bucket_ = this->get_bucket(h(k) % this->bucket_count_);
-+        node_ptr it = find_iterator(bucket_, k, eq);
- 
-         if (BOOST_UNORDERED_BORLAND_BOOL(it))
--            return iterator_base(bucket, it);
-+            return iterator_base(bucket_, it);
-         else
-             return this->end();
-     }
-@@ -611,8 +611,8 @@
-         if(!this->size_)
-             boost::throw_exception(std::out_of_range("Unable to find key in unordered_map."));
- 
--        bucket_ptr bucket = this->get_bucket(this->bucket_index(k));
--        node_ptr it = find_iterator(bucket, k);
-+        bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k));
-+        node_ptr it = find_iterator(bucket_, k);
- 
-         if (!it)
-             boost::throw_exception(std::out_of_range("Unable to find key in unordered_map."));
-@@ -630,10 +630,10 @@
-         if(!this->size_)
-             return iterator_pair(this->end(), this->end());
- 
--        bucket_ptr bucket = this->get_bucket(this->bucket_index(k));
--        node_ptr it = find_iterator(bucket, k);
-+        bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k));
-+        node_ptr it = find_iterator(bucket_, k);
-         if (BOOST_UNORDERED_BORLAND_BOOL(it)) {
--            iterator_base first(iterator_base(bucket, it));
-+            iterator_base first(iterator_base(bucket_, it));
-             iterator_base second(first);
-             second.increment_bucket(node::next_group(second.node_));
-             return iterator_pair(first, second);
-@@ -651,26 +651,26 @@
-     {
-         if(!this->size_) return;
- 
--        bucket_ptr end = this->get_bucket(this->bucket_count_);
--        for(bucket_ptr begin = this->buckets_; begin != end; ++begin) {
--            this->clear_bucket(begin);
-+        bucket_ptr end_ = this->get_bucket(this->bucket_count_);
-+        for(bucket_ptr begin_ = this->buckets_; begin_ != end_; ++begin_) {
-+            this->clear_bucket(begin_);
-         }
- 
-         this->size_ = 0;
--        this->cached_begin_bucket_ = end;
-+        this->cached_begin_bucket_ = end_;
-     }
- 
-     template <class T>
-     inline std::size_t hash_table<T>::erase_group(
--        node_ptr* it, bucket_ptr bucket)
-+        node_ptr* it, bucket_ptr bucket_)
-     {
-         node_ptr pos = *it;
--        node_ptr end = node::next_group(pos);
--        *it = end;
--        std::size_t count = this->delete_nodes(pos, end);
--        this->size_ -= count;
--        this->recompute_begin_bucket(bucket);
--        return count;
-+        node_ptr end_ = node::next_group(pos);
-+        *it = end_;
-+        std::size_t count_ = this->delete_nodes(pos, end_);
-+        this->size_ -= count_;
-+        this->recompute_begin_bucket(bucket_);
-+        return count_;
-     }
-     
-     template <class T>
-@@ -679,11 +679,11 @@
-         if(!this->size_) return 0;
-     
-         // No side effects in initial section
--        bucket_ptr bucket = this->get_bucket(this->bucket_index(k));
--        node_ptr* it = this->find_for_erase(bucket, k);
-+        bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k));
-+        node_ptr* it = this->find_for_erase(bucket_, k);
- 
-         // No throw.
--        return *it ? this->erase_group(it, bucket) : 0;
-+        return *it ? this->erase_group(it, bucket_) : 0;
-     }
- 
-     template <class T>
-@@ -766,12 +766,12 @@
-         std::size_t hash_value = this->hash_function()(k);
-         if(this->buckets_) this->reserve_for_insert(size);
-         else this->create_for_insert(size);
--        bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
-+        bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value);
-         node_ptr n = a.release();
--        node::add_to_bucket(n, *bucket);
-+        node::add_to_bucket(n, *bucket_);
-         ++this->size_;
--        this->cached_begin_bucket_ = bucket;
--        return iterator_base(bucket, n);
-+        this->cached_begin_bucket_ = bucket_;
-+        return iterator_base(bucket_, n);
-     }
- }}
- 
---- misc/boost_1_44_0/boost/unordered/detail/unique.hpp	2011-02-05 03:28:39.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/unordered/detail/unique.hpp	2011-02-05 03:36:54.000000000 +0100
-@@ -57,7 +57,7 @@
- 
-         bool equals(hash_unique_table const&) const;
- 
--        node_ptr add_node(node_constructor& a, bucket_ptr bucket);
-+        node_ptr add_node(node_constructor& a, bucket_ptr bucket_);
-         
- #if defined(BOOST_UNORDERED_STD_FORWARD)
- 
-@@ -135,8 +135,8 @@
-         if(this->size_ != other.size_) return false;
-         if(!this->size_) return true;
- 
--        bucket_ptr end = this->get_bucket(this->bucket_count_);
--        for(bucket_ptr i = this->cached_begin_bucket_; i != end; ++i)
-+        bucket_ptr end_ = this->get_bucket(this->bucket_count_);
-+        for(bucket_ptr i = this->cached_begin_bucket_; i != end_; ++i)
-         {
-             node_ptr it1 = i->next_;
-             while(BOOST_UNORDERED_BORLAND_BOOL(it1))
-@@ -159,13 +159,13 @@
-     template <class T>
-     inline BOOST_DEDUCED_TYPENAME hash_unique_table<T>::node_ptr
-         hash_unique_table<T>::add_node(node_constructor& a,
--            bucket_ptr bucket)
-+            bucket_ptr bucket_)
-     {
-         node_ptr n = a.release();
--        node::add_to_bucket(n, *bucket);
-+        node::add_to_bucket(n, *bucket_);
-         ++this->size_;
--        if(bucket < this->cached_begin_bucket_)
--            this->cached_begin_bucket_ = bucket;
-+        if(bucket_ < this->cached_begin_bucket_)
-+            this->cached_begin_bucket_ = bucket_;
-         return n;
-     }
-         
-@@ -181,7 +181,7 @@
-         typedef BOOST_DEDUCED_TYPENAME value_type::second_type mapped_type;
- 
-         std::size_t hash_value = this->hash_function()(k);
--        bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
-+        bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value);
-         
-         if(!this->buckets_) {
-             node_constructor a(*this);
-@@ -189,7 +189,7 @@
-             return *this->emplace_empty_impl_with_node(a, 1);
-         }
- 
--        node_ptr pos = this->find_iterator(bucket, k);
-+        node_ptr pos = this->find_iterator(bucket_, k);
- 
-         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
-             return node::get_value(pos);
-@@ -205,11 +205,11 @@
-             // reserve has basic exception safety if the hash function
-             // throws, strong otherwise.
-             if(this->reserve_for_insert(this->size_ + 1))
--                bucket = this->bucket_ptr_from_hash(hash_value);
-+                bucket_ = this->bucket_ptr_from_hash(hash_value);
- 
-             // Nothing after this point can throw.
- 
--            return node::get_value(add_node(a, bucket));
-+            return node::get_value(add_node(a, bucket_));
-         }
-     }
- 
-@@ -220,22 +220,22 @@
-         // No side effects in this initial code
-         key_type const& k = this->get_key(a.value());
-         std::size_t hash_value = this->hash_function()(k);
--        bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
--        node_ptr pos = this->find_iterator(bucket, k);
-+        bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value);
-+        node_ptr pos = this->find_iterator(bucket_, k);
-         
-         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
-             // Found an existing key, return it (no throw).
--            return emplace_return(iterator_base(bucket, pos), false);
-+            return emplace_return(iterator_base(bucket_, pos), false);
-         } else {
-             // reserve has basic exception safety if the hash function
-             // throws, strong otherwise.
-             if(this->reserve_for_insert(this->size_ + 1))
--                bucket = this->bucket_ptr_from_hash(hash_value);
-+                bucket_ = this->bucket_ptr_from_hash(hash_value);
- 
-             // Nothing after this point can throw.
- 
-             return emplace_return(
--                iterator_base(bucket, add_node(a, bucket)),
-+                iterator_base(bucket_, add_node(a, bucket_)),
-                 true);
-         }
-     }
-@@ -250,12 +250,12 @@
-     {
-         // No side effects in this initial code
-         std::size_t hash_value = this->hash_function()(k);
--        bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
--        node_ptr pos = this->find_iterator(bucket, k);
-+        bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value);
-+        node_ptr pos = this->find_iterator(bucket_, k);
- 
-         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
-             // Found an existing key, return it (no throw).
--            return emplace_return(iterator_base(bucket, pos), false);
-+            return emplace_return(iterator_base(bucket_, pos), false);
- 
-         } else {
-             // Doesn't already exist, add to bucket.
-@@ -269,12 +269,12 @@
-             // reserve has basic exception safety if the hash function
-             // throws, strong otherwise.
-             if(this->reserve_for_insert(this->size_ + 1))
--                bucket = this->bucket_ptr_from_hash(hash_value);
-+                bucket_ = this->bucket_ptr_from_hash(hash_value);
- 
-             // Nothing after this point can throw.
- 
-             return emplace_return(
--                iterator_base(bucket, add_node(a, bucket)),
-+                iterator_base(bucket_, add_node(a, bucket_)),
-                 true);
-         }
-     }
-@@ -313,21 +313,21 @@
-                 BOOST_UNORDERED_FUNCTION_PARAMS(z, num_params))                \
-     {                                                                          \
-         std::size_t hash_value = this->hash_function()(k);                     \
--        bucket_ptr bucket                                                      \
-+        bucket_ptr bucket_                                                      \
-             = this->bucket_ptr_from_hash(hash_value);                          \
--        node_ptr pos = this->find_iterator(bucket, k);                         \
-+        node_ptr pos = this->find_iterator(bucket_, k);                         \
-                                                                                \
-         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {                               \
--            return emplace_return(iterator_base(bucket, pos), false);          \
-+            return emplace_return(iterator_base(bucket_, pos), false);          \
-         } else {                                                               \
-             node_constructor a(*this);                                         \
-             a.construct(BOOST_UNORDERED_CALL_PARAMS(z, num_params));           \
-                                                                                \
-             if(this->reserve_for_insert(this->size_ + 1))                      \
--                bucket = this->bucket_ptr_from_hash(hash_value);               \
-+                bucket_ = this->bucket_ptr_from_hash(hash_value);               \
-                                                                                \
--            return emplace_return(iterator_base(bucket,                        \
--                add_node(a, bucket)), true);                                   \
-+            return emplace_return(iterator_base(bucket_,                        \
-+                add_node(a, bucket_)), true);                                   \
-         }                                                                      \
-     }                                                                          \
-                                                                                \
-@@ -441,8 +441,8 @@
-             // different second_type.
-             key_type const& k = extractor::extract(*i);
-             std::size_t hash_value = this->hash_function()(k);
--            bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
--            node_ptr pos = this->find_iterator(bucket, k);
-+            bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value);
-+            node_ptr pos = this->find_iterator(bucket_, k);
- 
-             if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) {
-                 // Doesn't already exist, add to bucket.
-@@ -456,11 +456,11 @@
-                 // throws, strong otherwise.
-                 if(this->size_ + 1 >= this->max_load_) {
-                     this->reserve_for_insert(this->size_ + insert_size(i, j));
--                    bucket = this->bucket_ptr_from_hash(hash_value);
-+                    bucket_ = this->bucket_ptr_from_hash(hash_value);
-                 }
- 
-                 // Nothing after this point can throw.
--                add_node(a, bucket);
-+                add_node(a, bucket_);
-             }
-         } while(++i != j);
-     }
---- misc/boost_1_44_0/boost/unordered/detail/equivalent.hpp	2010-06-09 01:23:43.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/unordered/detail/equivalent.hpp	2011-02-05 04:15:47.000000000 +0100
-@@ -57,7 +57,7 @@
-         bool equals(hash_equivalent_table const&) const;
- 
-         inline node_ptr add_node(node_constructor& a,
--            bucket_ptr bucket, node_ptr pos);
-+            bucket_ptr bucket_, node_ptr pos);
- 
- #if defined(BOOST_UNORDERED_STD_FORWARD)
- 
-@@ -117,8 +117,8 @@
-         if(this->size_ != other.size_) return false;
-         if(!this->size_) return true;
- 
--        bucket_ptr end = this->get_bucket(this->bucket_count_);
--        for(bucket_ptr i = this->cached_begin_bucket_; i != end; ++i)
-+        bucket_ptr end_ = this->get_bucket(this->bucket_count_);
-+        for(bucket_ptr i = this->cached_begin_bucket_; i != end_; ++i)
-         {
-             node_ptr it1 = i->next_;
-             while(BOOST_UNORDERED_BORLAND_BOOL(it1))
-@@ -149,16 +149,16 @@
-     template <class T>
-     inline BOOST_DEDUCED_TYPENAME hash_equivalent_table<T>::node_ptr
-         hash_equivalent_table<T>
--            ::add_node(node_constructor& a, bucket_ptr bucket, node_ptr pos)
-+            ::add_node(node_constructor& a, bucket_ptr bucket_, node_ptr pos)
-     {
-         node_ptr n = a.release();
-         if(BOOST_UNORDERED_BORLAND_BOOL(pos)) {
-             node::add_after_node(n, pos);                
-         }
-         else {
--            node::add_to_bucket(n, *bucket);
--            if(bucket < this->cached_begin_bucket_)
--                this->cached_begin_bucket_ = bucket;
-+            node::add_to_bucket(n, *bucket_);
-+            if(bucket_ < this->cached_begin_bucket_)
-+                this->cached_begin_bucket_ = bucket_;
-         }
-         ++this->size_;
-         return n;
-@@ -179,15 +179,15 @@
-             return this->emplace_empty_impl_with_node(a, 1);
-         }
-         else {
--            bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
--            node_ptr position = this->find_iterator(bucket, k);
-+            bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value);
-+            node_ptr position = this->find_iterator(bucket_, k);
- 
-             // reserve has basic exception safety if the hash function
-             // throws, strong otherwise.
-             if(this->reserve_for_insert(this->size_ + 1))
--                bucket = this->bucket_ptr_from_hash(hash_value);
-+                bucket_ = this->bucket_ptr_from_hash(hash_value);
- 
--            return iterator_base(bucket, add_node(a, bucket, position));
-+            return iterator_base(bucket_, add_node(a, bucket_, position));
-         }
-     }
-     
-@@ -196,8 +196,8 @@
-             ::emplace_impl_no_rehash(node_constructor& a)
-     {
-         key_type const& k = this->get_key(a.value());
--        bucket_ptr bucket = this->get_bucket(this->bucket_index(k));
--        add_node(a, bucket, this->find_iterator(bucket, k));
-+        bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k));
-+        add_node(a, bucket_, this->find_iterator(bucket_, k));
-     }
- 
- #if defined(BOOST_UNORDERED_STD_FORWARD)
 --- misc/boost_1_44_0/boost/ptr_container/exception.hpp	2011-02-05 09:42:56.074932485 +0000
 +++ misc/build/boost_1_44_0/boost/ptr_container/exception.hpp	2011-02-05 09:43:00.350931536 +0000
 @@ -24,7 +24,7 @@
@@ -838,61 +267,6 @@
          }           
                  
      public: // algorithms
---- misc/boost_1_44_0/boost/unordered/detail/table.hpp	2011-02-10 15:04:57.999046223 +0000
-+++ misc/build/boost_1_44_0/boost/unordered/detail/table.hpp	2011-02-10 15:05:44.260588237 +0000
-@@ -119,7 +119,7 @@
- 
-         // From 6.3.1/13:
-         // Only resize when size >= mlf_ * count
--        return double_to_size_t(ceil((double) mlf_ * this->bucket_count_));
-+        return double_to_size_t(ceil((double)mlf_ * (double)this->bucket_count_));
-     }
- 
-     template <class T>
-@@ -145,7 +145,7 @@
-         //
-         // Or from rehash post-condition:
-         // count > size / mlf_
--        return next_prime(double_to_size_t(floor(size / (double) mlf_)) + 1);
-+        return next_prime(double_to_size_t(floor((double)size / (double)mlf_)) + 1);
-     }
- 
-     ////////////////////////////////////////////////////////////////////////////
---- misc/boost_1_44_0/boost/functional/hash/detail/hash_float_generic.hpp	2011-02-10 14:50:52.173229648 +0000
-+++ misc/build/boost_1_44_0/boost/functional/hash/detail/hash_float_generic.hpp	2011-02-10 14:52:36.824433976 +0000
-@@ -53,7 +53,7 @@
- 
-             v = ldexp(v, limits<std::size_t>::digits);
-             std::size_t seed = static_cast<std::size_t>(v);
--            v -= seed;
-+            v -= static_cast<T>(seed);
- 
-             // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1;
-             std::size_t const length
-@@ -66,7 +66,7 @@
-             {
-                 v = ldexp(v, limits<std::size_t>::digits);
-                 std::size_t part = static_cast<std::size_t>(v);
--                v -= part;
-+                v -= static_cast<T>(part);
-                 hash_float_combine(seed, part);
-             }
- 
---- misc/boost_1_44_0/boost/dynamic_bitset.hpp	2011-02-28 17:10:13.892131527 +0000
-+++ misc/build/boost_1_44_0/boost/dynamic_bitset/dynamic_bitset.hpp	2011-02-28 17:11:05.868726195 +0000
-@@ -1108,10 +1108,10 @@
-   // beyond the "allowed" positions
-   typedef unsigned long result_type;
- 
--  const size_type max_size =
-+  const size_type max_size_ =
-             (std::min)(m_num_bits, static_cast<size_type>(ulong_width));
- 
--  const size_type last_block = block_index( max_size - 1 );
-+  const size_type last_block = block_index( max_size_ - 1 );
- 
-   assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));
- 
 --- misc/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp	2011-03-04 11:33:36.269274940 +0000
 +++ misc/build/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp	2011-03-04 11:33:36.269274940 +0000
 @@ -259,6 +259,10 @@
@@ -906,171 +280,3 @@
              if( !allow_null )
              {
                  BOOST_PTR_CONTAINER_THROW_EXCEPTION( 0 == x && "null not allowed", 
---- misc/boost_1_44_0/boost/pool/object_pool.hpp	2011-07-14 16:08:31.672964851 +0100
-+++ misc/build/boost_1_44_0/boost/pool/object_pool.hpp	2011-07-14 16:09:20.851594534 +0100
-@@ -53,8 +53,8 @@
- 
-   public:
-     // This constructor parameter is an extension!
--    explicit object_pool(const size_type next_size = 32)
--    :pool<UserAllocator>(sizeof(T), next_size) { }
-+    explicit object_pool(const size_type next_size_ = 32)
-+    :pool<UserAllocator>(sizeof(T), next_size_) { }
- 
-     ~object_pool();
- 
---- misc/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp	2008-11-23 12:13:35.000000000 +0100
-+++ misc/build/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp	2011-10-05 16:56:34.627320523 +0200
-@@ -108,7 +108,7 @@
-    */
-   BOOST_DATE_TIME_DECL 
-   boost::date_time::all_date_names_put<greg_facet_config, char>* 
--  create_facet_def(char type)
-+  create_facet_def(char /* type */)
-   {
-     typedef 
-       boost::date_time::all_date_names_put<greg_facet_config, char> facet_def;
-@@ -121,7 +121,7 @@
-   }
-   
-   //! generates a locale with the set of gregorian name-strings of type char*
--  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, char type){
-+  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, char /* type */){
-     typedef boost::date_time::all_date_names_put<greg_facet_config, char> facet_def;
-     return std::locale(loc, new facet_def(short_month_names,
-                                           long_month_names,
-@@ -139,7 +139,7 @@
-    */
-   BOOST_DATE_TIME_DECL 
-   boost::date_time::all_date_names_put<greg_facet_config, wchar_t>* 
--  create_facet_def(wchar_t type)
-+  create_facet_def(wchar_t /* type */)
-   {
-     typedef 
-       boost::date_time::all_date_names_put<greg_facet_config,wchar_t> facet_def;
-@@ -152,7 +152,7 @@
-   }
- 
-   //! generates a locale with the set of gregorian name-strings of type wchar_t*
--  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, wchar_t type){
-+  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale& loc, wchar_t /* type */){
-     typedef boost::date_time::all_date_names_put<greg_facet_config, wchar_t> facet_def;
-     return std::locale(loc, new facet_def(w_short_month_names,
-                                           w_long_month_names,
---- misc/boost_1_44_0/boost/date_time/time_facet.hpp	2012-08-20 09:12:51.552094137 +0100
-+++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp	2012-08-20 09:10:07.884255317 +0100
-@@ -439,31 +439,31 @@
-                               a_time_dur.get_rep().as_special());
-       }
- 
--      string_type format(m_time_duration_format);
-+      string_type lcl_format(m_time_duration_format);
-       if (a_time_dur.is_negative()) {
-         // replace %- with minus sign.  Should we use the numpunct facet?
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       duration_sign_negative_only,
-                                       negative_sign);
-           // remove all the %+ in the string with '-'
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       duration_sign_always,
-                                       negative_sign);
-       }
-       else { //duration is positive
-         // remove all the %- combos from the string
--        boost::algorithm::erase_all(format, duration_sign_negative_only);
-+        boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
-         // remove all the %+ in the string with '+'
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       duration_sign_always,
-                                       positive_sign);
-       }
- 
-       // %T and %R have to be replaced here since they are not standard
--      boost::algorithm::replace_all(format,
-+      boost::algorithm::replace_all(lcl_format,
-         boost::as_literal(formats_type::full_24_hour_time_format),
-         boost::as_literal(formats_type::full_24_hour_time_expanded_format));
--      boost::algorithm::replace_all(format,
-+      boost::algorithm::replace_all(lcl_format,
-         boost::as_literal(formats_type::short_24_hour_time_format),
-         boost::as_literal(formats_type::short_24_hour_time_expanded_format));
- 
-@@ -476,22 +476,22 @@
-        * here ourself.
-        */
-       string_type hours_str;
--      if (format.find(unrestricted_hours_format) != string_type::npos) {
-+      if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
-         hours_str = hours_as_string(a_time_dur);
--        boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
-+        boost::algorithm::replace_all(lcl_format, unrestricted_hours_format, hours_str);
-       }
-       // We still have to process restricted hours format specifier. In order to
-       // support parseability of durations in ISO format (%H%M%S), we'll have to
-       // restrict the stringified hours length to 2 characters.
--      if (format.find(hours_format) != string_type::npos) {
-+      if (lcl_format.find(hours_format) != string_type::npos) {
-         if (hours_str.empty())
-           hours_str = hours_as_string(a_time_dur);
-         BOOST_ASSERT(hours_str.length() <= 2);
--        boost::algorithm::replace_all(format, hours_format, hours_str);
-+        boost::algorithm::replace_all(lcl_format, hours_format, hours_str);
-       }
- 
-       string_type frac_str;
--      if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
-+      if (lcl_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
-         // replace %s with %S.nnn
-         frac_str =
-           fractional_seconds_as_string(a_time_dur, false);
-@@ -500,21 +500,21 @@
-         string_type replace_string(seconds_format);
-         replace_string += sep;
-         replace_string += frac_str;
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       seconds_with_fractional_seconds_format,
-                                       replace_string);
-       }
--      if (format.find(fractional_seconds_format) != string_type::npos) {
-+      if (lcl_format.find(fractional_seconds_format) != string_type::npos) {
-         // replace %f with nnnnnnn
-         if (!frac_str.size()) {
-           frac_str = fractional_seconds_as_string(a_time_dur, false);
-         }
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       fractional_seconds_format,
-                                       frac_str);
-       }
- 
--      if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
-+      if (lcl_format.find(fractional_seconds_or_none_format) != string_type::npos) {
-         // replace %F with nnnnnnn or nothing if fs == 0
-         frac_str =
-           fractional_seconds_as_string(a_time_dur, true);
-@@ -523,18 +523,18 @@
-           string_type replace_string;
-           replace_string += sep;
-           replace_string += frac_str;
--          boost::algorithm::replace_all(format,
-+          boost::algorithm::replace_all(lcl_format,
-                                         fractional_seconds_or_none_format,
-                                         replace_string);
-         }
-         else {
--          boost::algorithm::erase_all(format,
-+          boost::algorithm::erase_all(lcl_format,
-                                       fractional_seconds_or_none_format);
-         }
-       }
- 
-       return this->do_put_tm(a_next, a_ios, a_fill,
--                       to_tm(a_time_dur), format);
-+                       to_tm(a_time_dur), lcl_format);
-     }
- 
-     OutItrT put(OutItrT next, std::ios_base& a_ios,