[Libreoffice-commits] .: 3 commits - boost/aliasing.patch boost/boost_1_39_0.patch boost/boost_1_44_0.patch boost/boost.4713.warnings.patch boost/makefile.mk
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Feb 4 19:27:06 PST 2011
boost/aliasing.patch | 43 -
boost/boost.4713.warnings.patch | 1141 ++++++++++++++++++----------------------
boost/boost_1_39_0.patch | 312 ----------
boost/boost_1_44_0.patch | 25
boost/makefile.mk | 7
5 files changed, 544 insertions(+), 984 deletions(-)
New commits:
commit 53f9b7149d769a202b04bafae926aa933ff48cc2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 04:22:32 2011 +0100
some more warnings gone
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index ce02d66..0dc8494 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -389,6 +389,17 @@
#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
@@ -551,3 +562,77 @@
}
} 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)
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 2d25dc3..b9912d2 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -51,9 +51,6 @@ all:
TARFILE_NAME=boost_1_44_0
TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
PATCH_FILES=$(TARFILE_NAME).patch
-# See https://svn.boost.org/trac/boost/ticket/3780
-#PATCH_FILES+=aliasing.patch
-
#https://svn.boost.org/trac/boost/ticket/4713
PATCH_FILES+=boost.4713.warnings.patch
commit b7ff6b96a43c336667421ad663d710fcba5afbbc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Feb 5 03:47:27 2011 +0100
silence more boost warnings
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index 458bb02..ce02d66 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -162,3 +162,392 @@
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)
+
+@@ -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);
+ }
commit 01f1d954670e13a7a42e8ca86d2f131612856df4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Feb 4 16:57:37 2011 +0100
upgrade to boost 1.44.0 to solve some std::forward issues
diff --git a/boost/aliasing.patch b/boost/aliasing.patch
deleted file mode 100644
index 07840a4..0000000
--- a/boost/aliasing.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- misc/boost_1_39_0/boost/function/function_base.hpp
-+++ misc/build/boost_1_39_0/boost/function/function_base.hpp
-@@ -2,6 +2,7 @@
-
- // Copyright Douglas Gregor 2001-2006
- // Copyright Emil Dotchevski 2007
-+// Copyright Dean Michael Berris 2009
- // Use, modification and distribution is subject to the Boost Software License, Version 1.0.
- // (See accompanying file LICENSE_1_0.txt or copy at
- // http://www.boost.org/LICENSE_1_0.txt)
-@@ -44,6 +45,13 @@
- # pragma warning( disable : 4127 ) // "conditional expression is constant"
- #endif
-
-+#if defined(__GNUC__)
-+// Because GCC complains of strict aliasing problems, we make it
-+// treat the header as a system header, becoming more forgiving with
-+// treating implementation details that may be potentially harmful.
-+# pragma GCC system_header
-+#endif
-+
- // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
- #ifdef BOOST_NO_STD_TYPEINFO
- // Embedded VC++ does not have type_info in namespace std
-@@ -314,15 +322,15 @@
- {
- if (op == clone_functor_tag || op == move_functor_tag) {
- const functor_type* in_functor =
-- reinterpret_cast<const functor_type*>(&in_buffer.data);
-+ static_cast<const functor_type*>(static_cast<void*>(&in_buffer.data));
- new ((void*)&out_buffer.data) functor_type(*in_functor);
-
- if (op == move_functor_tag) {
-- reinterpret_cast<functor_type*>(&in_buffer.data)->~Functor();
-+ static_cast<functor_type*>(static_cast<void*>(&in_buffer.data))->~Functor();
- }
- } else if (op == destroy_functor_tag) {
- // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
-- reinterpret_cast<functor_type*>(&out_buffer.data)->~Functor();
-+ static_cast<functor_type*>(static_cast<void*>(&out_buffer.data))->~Functor();
- } else if (op == check_functor_type_tag) {
- const detail::sp_typeinfo& check_type
- = *out_buffer.type.type;
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index 805447c..458bb02 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -1,16 +1,52 @@
---- misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp
-@@ -126,8 +126,8 @@
- typedef unary<ParserT, parser<self_t> > base_t;
- typedef unary_parser_category parser_category_t;
-
-- assertive_parser(ParserT const& parser, ErrorDescrT descriptor)
-- : base_t(parser), descriptor(descriptor) {}
-+ assertive_parser(ParserT const& parser, ErrorDescrT descriptor_)
-+ : base_t(parser), descriptor(descriptor_) {}
+--- misc/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp 2008-06-24 22:37:35.000000000 +0200
++++ misc/build/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp 2011-02-04 16:39:19.000000000 +0100
+@@ -49,7 +49,7 @@
+ : first(rp->first), second(rp->second)
+ { }
+
+- const ref_pair* const operator->() const
++ const ref_pair* operator->() const
+ {
+ return this;
+ }
+--- misc/boost_1_44_0/boost/ptr_container/ptr_map_adapter.hpp 2008-06-24 22:37:35.000000000 +0200
++++ misc/build/boost_1_44_0/boost/ptr_container/ptr_map_adapter.hpp 2011-02-04 16:39:19.000000000 +0100
+@@ -477,6 +477,7 @@
+ }
+
+ ptr_map_adapter( const ptr_map_adapter& r )
++ : base_type()
+ {
+ map_basic_clone_and_insert( r.begin(), r.end() );
+ }
+--- misc/boost_1_44_0/boost/ptr_container/ptr_sequence_adapter.hpp 2009-11-01 12:07:12.000000000 +0100
++++ misc/build/boost_1_44_0/boost/ptr_container/ptr_sequence_adapter.hpp 2011-02-04 16:39:19.000000000 +0100
+@@ -476,19 +476,19 @@
+ public: // C-array support
+
+ void transfer( iterator before, value_type* from,
+- size_type size, bool delete_from = true ) // strong
++ size_type size_, bool delete_from = true ) // strong
+ {
+ BOOST_ASSERT( from != 0 );
+ if( delete_from )
+ {
+ BOOST_DEDUCED_TYPENAME base_type::scoped_deleter
+- deleter( from, size ); // nothrow
+- this->base().insert( before.base(), from, from + size ); // strong
++ deleter( from, size_ ); // nothrow
++ this->base().insert( before.base(), from, from + size_ ); // strong
+ deleter.release(); // nothrow
+ }
+ else
+ {
+- this->base().insert( before.base(), from, from + size ); // strong
++ this->base().insert( before.base(), from, from + size_ ); // strong
+ }
+ }
- template <typename ScannerT>
- struct result
+--- 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(
@@ -23,8 +59,28 @@
result_t result;
std::ptrdiff_t length;
---- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp
+--- 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 @@
+ {
+ typedef typename ScannerT::iterator_t iterator_t;
+ iterator_t first = scan.first;
+- typename SetT::search_info result = SetT::find(scan);
++ typename SetT::search_info result_ = SetT::find(scan);
+
+- if (result.data)
++ if (result_.data)
+ return scan.
+ create_match(
+- result.length,
+- symbol_ref_t(*result.data),
++ result_.length,
++ symbol_ref_t(*result_.data),
+ 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;
@@ -42,8 +98,8 @@
}
};
---- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp
+--- 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;
@@ -106,640 +162,3 @@
m_min,
m_max);
}
---- misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp
-@@ -102,13 +102,13 @@
- {
- typedef typename ScannerT::iterator_t iterator_t;
- iterator_t first = scan.first;
-- typename SetT::search_info result = SetT::find(scan);
-+ typename SetT::search_info result_ = SetT::find(scan);
-
-- if (result.data)
-+ if (result_.data)
- return scan.
- create_match(
-- result.length,
-- symbol_ref_t(*result.data),
-+ result_.length,
-+ symbol_ref_t(*result_.data),
- first,
- scan.first);
- else
-
---- misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp
-+++ misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp
-@@ -82,8 +82,8 @@
- //Give duration access to ticks constructor -- hide from users
- friend class date_time::time_duration<time_duration, time_res_traits>;
- private:
-- explicit time_duration(impl_type ticks) :
-- date_time::time_duration<time_duration, time_res_traits>(ticks)
-+ explicit time_duration(impl_type _ticks) :
-+ date_time::time_duration<time_duration, time_res_traits>(_ticks)
- {}
- };
-
---- misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp
-@@ -49,7 +49,7 @@
- : first(rp->first), second(rp->second)
- { }
-
-- const ref_pair* const operator->() const
-+ const ref_pair* operator->() const
- {
- return this;
- }
---- misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp
-@@ -476,19 +476,19 @@
- public: // C-array support
-
- void transfer( iterator before, value_type* from,
-- size_type size, bool delete_from = true ) // strong
-+ size_type size_, bool delete_from = true ) // strong
- {
- BOOST_ASSERT( from != 0 );
- if( delete_from )
- {
- BOOST_DEDUCED_TYPENAME base_type::scoped_deleter
-- deleter( from, size ); // nothrow
-- this->base().insert( before.base(), from, from + size ); // strong
-+ deleter( from, size_ ); // nothrow
-+ this->base().insert( before.base(), from, from + size_ ); // strong
- deleter.release(); // nothrow
- }
- else
- {
-- this->base().insert( before.base(), from, from + size ); // strong
-+ this->base().insert( before.base(), from, from + size_ ); // strong
- }
- }
-
-@@ -510,72 +510,72 @@
-
- public: // resize
-
-- void resize( size_type size ) // basic
-+ void resize( size_type size_ ) // basic
- {
- size_type old_size = this->size();
-- if( old_size > size )
-+ if( old_size > size_ )
- {
-- this->erase( boost::next( this->begin(), size ), this->end() );
-+ this->erase( boost::next( this->begin(), size_ ), this->end() );
- }
-- else if( size > old_size )
-+ else if( size_ > old_size )
- {
-- for( ; old_size != size; ++old_size )
-+ for( ; old_size != size_; ++old_size )
- this->push_back( new BOOST_DEDUCED_TYPENAME
- boost::remove_pointer<value_type>::type );
- }
-
-- BOOST_ASSERT( this->size() == size );
-+ BOOST_ASSERT( this->size() == size_ );
- }
-
-- void resize( size_type size, value_type to_clone ) // basic
-+ void resize( size_type size_, value_type to_clone ) // basic
- {
- size_type old_size = this->size();
-- if( old_size > size )
-+ if( old_size > size_ )
- {
-- this->erase( boost::next( this->begin(), size ), this->end() );
-+ this->erase( boost::next( this->begin(), size_ ), this->end() );
- }
-- else if( size > old_size )
-+ else if( size_ > old_size )
- {
-- for( ; old_size != size; ++old_size )
-+ for( ; old_size != size_; ++old_size )
- this->push_back( this->null_policy_allocate_clone( to_clone ) );
- }
-
-- BOOST_ASSERT( this->size() == size );
-+ BOOST_ASSERT( this->size() == size_ );
- }
-
-- void rresize( size_type size ) // basic
-+ void rresize( size_type size_ ) // basic
- {
- size_type old_size = this->size();
-- if( old_size > size )
-+ if( old_size > size_ )
- {
- this->erase( this->begin(),
-- boost::next( this->begin(), old_size - size ) );
-+ boost::next( this->begin(), old_size - size_ ) );
- }
-- else if( size > old_size )
-+ else if( size_ > old_size )
- {
-- for( ; old_size != size; ++old_size )
-+ for( ; old_size != size_; ++old_size )
- this->push_front( new BOOST_DEDUCED_TYPENAME
- boost::remove_pointer<value_type>::type );
- }
-
-- BOOST_ASSERT( this->size() == size );
-+ BOOST_ASSERT( this->size() == size_ );
- }
-
-- void rresize( size_type size, value_type to_clone ) // basic
-+ void rresize( size_type size_, value_type to_clone ) // basic
- {
- size_type old_size = this->size();
-- if( old_size > size )
-+ if( old_size > size_ )
- {
- this->erase( this->begin(),
-- boost::next( this->begin(), old_size - size ) );
-+ boost::next( this->begin(), old_size - size_ ) );
- }
-- else if( size > old_size )
-+ else if( size_ > old_size )
- {
-- for( ; old_size != size; ++old_size )
-+ for( ; old_size != size_; ++old_size )
- this->push_front( this->null_policy_allocate_clone( to_clone ) );
- }
-
-- BOOST_ASSERT( this->size() == size );
-+ BOOST_ASSERT( this->size() == size_ );
- }
-
- public: // algorithms
---- misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp
-@@ -477,6 +477,7 @@
- }
-
- ptr_map_adapter( const ptr_map_adapter& r )
-+ : base_type()
- {
- map_basic_clone_and_insert( r.begin(), r.end() );
- }
---- misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp
-+++ misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp
-@@ -423,17 +423,17 @@
- void delete_buckets()
- {
- if(buckets_) {
-- bucket_ptr begin = cached_begin_bucket_;
-- bucket_ptr end = buckets_end();
-- while(begin != end) {
-- clear_bucket(begin);
-- ++begin;
-+ bucket_ptr begin_ = cached_begin_bucket_;
-+ bucket_ptr end_ = buckets_end();
-+ while(begin_ != end_) {
-+ clear_bucket(begin_);
-+ ++begin_;
- }
-
- // Destroy an extra bucket for the sentinels.
-- ++end;
-- for(begin = buckets_; begin != end; ++begin)
-- allocators_.bucket_alloc_.destroy(begin);
-+ ++end_;
-+ for(begin_ = buckets_; begin_ != end_; ++begin_)
-+ allocators_.bucket_alloc_.destroy(begin_);
-
- allocators_.bucket_alloc_.deallocate(buckets_,
- bucket_manager_.bucket_count() + 1);
-@@ -680,11 +680,11 @@
- // The deleted node is at the end of the group, so the
- // first node in the group is pointing to it.
- // Find that to change its pointer.
-- link_ptr it = n->group_prev_;
-- while(prev_in_group(it) != *pos) {
-- it = prev_in_group(it);
-+ link_ptr it2 = n->group_prev_;
-+ while(prev_in_group(it2) != *pos) {
-+ it2 = prev_in_group(it2);
- }
-- prev_in_group(it) = n->group_prev_;
-+ prev_in_group(it2) = n->group_prev_;
- }
- *pos = next;
- --size_;
-@@ -721,25 +721,25 @@
- size_ -= node_count(n.node_);
- }
-
-- void unlink_nodes(iterator_base begin, iterator_base end)
-+ void unlink_nodes(iterator_base begin_, iterator_base end_)
- {
-- BOOST_ASSERT(begin.bucket_ == end.bucket_);
-- size_ -= node_count(begin.node_, end.node_);
-- link_ptr* it = get_for_erase(begin);
-- split_group(*it, end.node_);
-- *it = end.node_;
-+ BOOST_ASSERT(begin_.bucket_ == end_.bucket_);
-+ size_ -= node_count(begin_.node_, end_.node_);
-+ link_ptr* it = get_for_erase(begin_);
-+ split_group(*it, end_.node_);
-+ *it = end_.node_;
- }
-
-- void unlink_nodes(bucket_ptr base, iterator_base end)
-+ void unlink_nodes(bucket_ptr base, iterator_base end_)
- {
-- BOOST_ASSERT(base == end.bucket_);
-+ BOOST_ASSERT(base == end_.bucket_);
-
-- split_group(end.node_);
-+ split_group(end_.node_);
-
- link_ptr ptr(base->next_);
-- base->next_ = end.node_;
-+ base->next_ = end_.node_;
-
-- size_ -= node_count(ptr, end.node_);
-+ size_ -= node_count(ptr, end_.node_);
- }
-
- #if BOOST_UNORDERED_EQUIVALENT_KEYS
-@@ -797,12 +797,12 @@
- {
- node_constructor a(allocators_);
-
-- link_ptr end = next_group(it);
-+ link_ptr end_ = next_group(it);
-
- a.construct(get_value(it)); // throws
- link_ptr n = link_node_in_bucket(a, dst);
-
-- for(it = it->next_; it != end; it = it->next_) {
-+ for(it = it->next_; it != end_; it = it->next_) {
- a.construct(get_value(it)); // throws
- link_node(a, n);
- }
-@@ -824,21 +824,21 @@
- //
- // no throw
-
-- void delete_to_bucket_end(link_ptr begin)
-+ void delete_to_bucket_end(link_ptr begin_)
- {
-- while(begin) {
-- link_ptr node = begin;
-- begin = begin->next_;
-- allocators_.destroy(node);
-+ while(begin_) {
-+ link_ptr node_ = begin_;
-+ begin_ = begin_->next_;
-+ allocators_.destroy(node_);
- }
- }
-
-- void delete_nodes(link_ptr begin, link_ptr end)
-+ void delete_nodes(link_ptr begin_, link_ptr end_)
- {
-- while(begin != end) {
-- link_ptr node = begin;
-- begin = begin->next_;
-- allocators_.destroy(node);
-+ while(begin_ != end_) {
-+ link_ptr node_ = begin_;
-+ begin_ = begin_->next_;
-+ allocators_.destroy(node_);
- }
- }
-
-@@ -848,9 +848,9 @@
- delete_nodes(first_node, prev_in_group(first_node)->next_);
- }
- #else
-- void delete_group(link_ptr node)
-+ void delete_group(link_ptr node_)
- {
-- allocators_.destroy(node);
-+ allocators_.destroy(node_);
- }
- #endif
-
-@@ -869,15 +869,15 @@
-
- void clear()
- {
-- bucket_ptr begin = cached_begin_bucket_;
-- bucket_ptr end = buckets_end();
-+ bucket_ptr begin_ = cached_begin_bucket_;
-+ bucket_ptr end_ = buckets_end();
-
- size_ = 0;
-- cached_begin_bucket_ = end;
-+ cached_begin_bucket_ = end_;
-
-- while(begin != end) {
-- clear_bucket(begin);
-- ++begin;
-+ while(begin_ != end_) {
-+ clear_bucket(begin_);
-+ ++begin_;
- }
- }
-
-@@ -974,13 +974,13 @@
- cached_begin_bucket_ = b2;
- }
-
-- size_type erase_group(link_ptr* it, bucket_ptr bucket)
-+ size_type erase_group(link_ptr* it, bucket_ptr bucket_)
- {
- link_ptr pos = *it;
- size_type count = unlink_group(it);
- delete_group(pos);
-
-- this->recompute_begin_bucket(bucket);
-+ this->recompute_begin_bucket(bucket_);
-
- return count;
- }
-@@ -1541,8 +1541,8 @@
- hf(extract_key(data::get_value(src_bucket->next_))));
-
- link_ptr n = src_bucket->next_;
-- size_type count = src.unlink_group(&src_bucket->next_);
-- dst.link_group(n, dst_bucket, count);
-+ size_type count_ = src.unlink_group(&src_bucket->next_);
-+ dst.link_group(n, dst_bucket, count_);
- }
- }
- }
-@@ -1651,20 +1651,20 @@
- {
- key_type const& k = extract_key(a.get()->value());
- size_type hash_value = hash_function()(k);
-- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
-- link_ptr position = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
-+ link_ptr position = find_iterator(bucket_, k);
-
- // reserve has basic exception safety if the hash function
- // throws, strong otherwise.
- if(reserve_for_insert(size() + 1))
-- bucket = data_.bucket_ptr_from_hash(hash_value);
-+ bucket_ = data_.bucket_ptr_from_hash(hash_value);
-
- // I'm relying on link_ptr not being invalidated by
- // the rehash here.
-- return iterator_base(bucket,
-+ return iterator_base(bucket_,
- (BOOST_UNORDERED_BORLAND_BOOL(position)) ?
- data_.link_node(a, position) :
-- data_.link_node_in_bucket(a, bucket)
-+ data_.link_node_in_bucket(a, bucket_)
- );
- }
-
-@@ -1718,13 +1718,13 @@
- a.construct(*i);
-
- key_type const& k = extract_key(a.get()->value());
-- bucket_ptr bucket = get_bucket(k);
-- link_ptr position = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = get_bucket(k);
-+ link_ptr position = find_iterator(bucket_, k);
-
- if(BOOST_UNORDERED_BORLAND_BOOL(position))
- data_.link_node(a, position);
- else
-- data_.link_node_in_bucket(a, bucket);
-+ data_.link_node_in_bucket(a, bucket_);
- }
- }
- }
-@@ -1761,8 +1761,8 @@
- typedef BOOST_DEDUCED_TYPENAME value_type::second_type mapped_type;
-
- size_type hash_value = hash_function()(k);
-- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
-- link_ptr pos = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
-+ link_ptr pos = find_iterator(bucket_, k);
-
- if (BOOST_UNORDERED_BORLAND_BOOL(pos))
- return data::get_value(pos);
-@@ -1778,11 +1778,11 @@
- // reserve has basic exception safety if the hash function
- // throws, strong otherwise.
- if(reserve_for_insert(size() + 1))
-- bucket = data_.bucket_ptr_from_hash(hash_value);
-+ bucket_ = data_.bucket_ptr_from_hash(hash_value);
-
- // Nothing after this point can throw.
-
-- return data::get_value(data_.link_node_in_bucket(a, bucket));
-+ return data::get_value(data_.link_node_in_bucket(a, bucket_));
- }
- }
-
-@@ -1797,13 +1797,13 @@
- // No side effects in this initial code
- key_type const& k = extract_key(v);
- size_type hash_value = hash_function()(k);
-- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
-- link_ptr pos = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
-+ link_ptr pos = find_iterator(bucket_, k);
-
- if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
- // Found an existing key, return it (no throw).
- return std::pair<iterator_base, bool>(
-- iterator_base(bucket, pos), false);
-+ iterator_base(bucket_, pos), false);
-
- } else {
- // Doesn't already exist, add to bucket.
-@@ -1817,14 +1817,14 @@
- // reserve has basic exception safety if the hash function
- // throws, strong otherwise.
- if(reserve_for_insert(size() + 1))
-- bucket = data_.bucket_ptr_from_hash(hash_value);
-+ bucket_ = data_.bucket_ptr_from_hash(hash_value);
-
- // Nothing after this point can throw.
-
-- link_ptr n = data_.link_node_in_bucket(a, bucket);
-+ link_ptr n = data_.link_node_in_bucket(a, bucket_);
-
- return std::pair<iterator_base, bool>(
-- iterator_base(bucket, n), true);
-+ iterator_base(bucket_, n), true);
- }
- }
-
-@@ -1864,13 +1864,13 @@
- {
- // No side effects in this initial code
- size_type hash_value = hash_function()(k);
-- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
-- link_ptr pos = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
-+ link_ptr pos = find_iterator(bucket_, k);
-
- if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
- // Found an existing key, return it (no throw).
- return std::pair<iterator_base, bool>(
-- iterator_base(bucket, pos), false);
-+ iterator_base(bucket_, pos), false);
-
- } else {
- // Doesn't already exist, add to bucket.
-@@ -1884,12 +1884,12 @@
- // reserve has basic exception safety if the hash function
- // throws, strong otherwise.
- if(reserve_for_insert(size() + 1))
-- bucket = data_.bucket_ptr_from_hash(hash_value);
-+ bucket_ = data_.bucket_ptr_from_hash(hash_value);
-
- // Nothing after this point can throw.
-
-- return std::pair<iterator_base, bool>(iterator_base(bucket,
-- data_.link_node_in_bucket(a, bucket)), true);
-+ return std::pair<iterator_base, bool>(iterator_base(bucket_,
-+ data_.link_node_in_bucket(a, bucket_)), true);
- }
- }
-
-@@ -1904,23 +1904,23 @@
- // No side effects in this initial code
- key_type const& k = extract_key(a.get()->value());
- size_type hash_value = hash_function()(k);
-- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
-- link_ptr pos = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
-+ link_ptr pos = find_iterator(bucket_, k);
-
- if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
- // Found an existing key, return it (no throw).
- return std::pair<iterator_base, bool>(
-- iterator_base(bucket, pos), false);
-+ iterator_base(bucket_, pos), false);
- } else {
- // reserve has basic exception safety if the hash function
- // throws, strong otherwise.
- if(reserve_for_insert(size() + 1))
-- bucket = data_.bucket_ptr_from_hash(hash_value);
-+ bucket_ = data_.bucket_ptr_from_hash(hash_value);
-
- // Nothing after this point can throw.
-
-- return std::pair<iterator_base, bool>(iterator_base(bucket,
-- data_.link_node_in_bucket(a, bucket)), true);
-+ return std::pair<iterator_base, bool>(iterator_base(bucket_,
-+ data_.link_node_in_bucket(a, bucket_)), true);
- }
- }
-
-@@ -1969,8 +1969,8 @@
- for (; i != j; ++i) {
- // No side effects in this initial code
- size_type hash_value = hash_function()(extract_key(*i));
-- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
-- link_ptr pos = find_iterator(bucket, extract_key(*i));
-+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
-+ link_ptr pos = find_iterator(bucket_, extract_key(*i));
-
- if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) {
- // Doesn't already exist, add to bucket.
-@@ -1984,11 +1984,11 @@
- // throws, strong otherwise.
- if(size() + 1 >= max_load_) {
- reserve_for_insert(size() + insert_size(i, j));
-- bucket = data_.bucket_ptr_from_hash(hash_value);
-+ bucket_ = data_.bucket_ptr_from_hash(hash_value);
- }
-
- // Nothing after this point can throw.
-- data_.link_node_in_bucket(a, bucket);
-+ data_.link_node_in_bucket(a, bucket_);
- }
- }
- }
-@@ -2001,11 +2001,11 @@
- size_type erase_key(key_type const& k)
- {
- // No side effects in initial section
-- bucket_ptr bucket = get_bucket(k);
-- link_ptr* it = find_for_erase(bucket, k);
-+ bucket_ptr bucket_ = get_bucket(k);
-+ link_ptr* it = find_for_erase(bucket_, k);
-
- // No throw.
-- return *it ? data_.erase_group(it, bucket) : 0;
-+ return *it ? data_.erase_group(it, bucket_) : 0;
- }
-
- // count
-@@ -2022,19 +2022,19 @@
- // strong exception safety, no side effects
- iterator_base find(key_type const& k) const
- {
-- bucket_ptr bucket = get_bucket(k);
-- link_ptr it = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = get_bucket(k);
-+ link_ptr it = find_iterator(bucket_, k);
-
- if (BOOST_UNORDERED_BORLAND_BOOL(it))
-- return iterator_base(bucket, it);
-+ return iterator_base(bucket_, it);
- else
- return data_.end();
- }
-
- value_type& at(key_type const& k) const
- {
-- bucket_ptr bucket = get_bucket(k);
-- link_ptr it = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = get_bucket(k);
-+ link_ptr it = find_iterator(bucket_, k);
-
- if (BOOST_UNORDERED_BORLAND_BOOL(it))
- return data::get_value(it);
-@@ -2047,10 +2047,10 @@
- // strong exception safety, no side effects
- std::pair<iterator_base, iterator_base> equal_range(key_type const& k) const
- {
-- bucket_ptr bucket = get_bucket(k);
-- link_ptr it = find_iterator(bucket, k);
-+ bucket_ptr bucket_ = get_bucket(k);
-+ link_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_group();
- return std::pair<iterator_base, iterator_base>(first, second);
-@@ -2074,10 +2074,10 @@
- }
-
- // strong exception safety, no side effects
-- link_ptr find_iterator(bucket_ptr bucket,
-+ link_ptr find_iterator(bucket_ptr bucket_,
- key_type const& k) const
- {
-- link_ptr it = data_.begin(bucket);
-+ link_ptr it = data_.begin(bucket_);
- while (BOOST_UNORDERED_BORLAND_BOOL(it) && !equal(k, data::get_value(it)))
- it = data::next_group(it);
-
-@@ -2085,9 +2085,9 @@
- }
-
- // strong exception safety, no side effects
-- link_ptr* find_for_erase(bucket_ptr bucket, key_type const& k) const
-+ link_ptr* find_for_erase(bucket_ptr bucket_, key_type const& k) const
- {
-- link_ptr* it = &bucket->next_;
-+ link_ptr* it = &bucket_->next_;
- while(BOOST_UNORDERED_BORLAND_BOOL(*it) && !equal(k, data::get_value(*it)))
- it = &data::next_group(*it);
-
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
deleted file mode 100644
index 46395dd..0000000
--- a/boost/boost_1_39_0.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-diff --git boost_1_39_0/boost/config/compiler/visualc.hpp boost_1_39_0/boost/config/compiler/visualc.hpp
-index 552e5bb..d9f90b2 100644
---- misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
-+++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
-@@ -138,6 +138,9 @@
- # define BOOST_NO_RTTI
- #endif
-
-+// disable WORKAROUND macro - gives warning for undefined macros
-+#define BOOST_STRICT_CONFIG 1
-+
- //
- // all versions support __declspec:
- //
-diff --git boost_1_39_0/boost/function/function_base.hpp boost_1_39_0/boost/function/function_base.hpp
-index 6612fb8..35afa16 100644
---- misc/build/boost_1_39_0/boost/function/function_base.hpp
-+++ misc/build/boost_1_39_0/boost/function/function_base.hpp
-@@ -42,7 +42,7 @@
- #endif
-
- // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
--#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
-+#ifdef BOOST_NO_STD_TYPEINFO
- // Embedded VC++ does not have type_info in namespace std
- # define BOOST_FUNCTION_STD_NS
- #else
-diff --git boost_1_39_0/boost/function/function_template.hpp boost_1_39_0/boost/function/function_template.hpp
-index 584abe9..36b619b 100644
---- misc/build/boost_1_39_0/boost/function/function_template.hpp
-+++ misc/build/boost_1_39_0/boost/function/function_template.hpp
-@@ -950,10 +950,10 @@ namespace boost {
- f.vtable->manager(f.functor, this->functor,
- boost::detail::function::move_functor_tag);
- f.vtable = 0;
--#if !defined(BOOST_NO_EXCEPTIONS)
- } else {
- clear();
- }
-+#if !defined(BOOST_NO_EXCEPTIONS)
- } catch (...) {
- vtable = 0;
- throw;
-diff --git boost_1_39_0/boost/mpl/apply_wrap.hpp boost_1_39_0/boost/mpl/apply_wrap.hpp
-index b3cb12b..0bf8e73 100644
---- misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
-+++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
-@@ -173,8 +173,8 @@ struct BOOST_PP_CAT(apply_wrap,i_)<AUX778076_APPLY_WRAP_SPEC_PARAMS(i_, int)>
- # undef i_
-
- ///// iteration, depth == 2
--
--#elif BOOST_PP_ITERATION_DEPTH() == 2
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 2
-
- # define j_ BOOST_PP_FRAME_ITERATION(2)
-
-@@ -231,4 +231,5 @@ struct BOOST_PP_CAT(apply_wrap_impl,i_)<
- # undef j_
-
- #endif // BOOST_PP_ITERATION_DEPTH()
-+#endif
- #endif // BOOST_PP_IS_ITERATING
-diff --git boost_1_39_0/boost/mpl/bind.hpp boost_1_39_0/boost/mpl/bind.hpp
-index 5d851ef..780e260 100644
---- misc/build/boost_1_39_0/boost/mpl/bind.hpp
-+++ misc/build/boost_1_39_0/boost/mpl/bind.hpp
-@@ -531,7 +531,8 @@ struct bind_chooser<i_>
-
- ///// iteration, depth == 2
-
--#elif BOOST_PP_ITERATION_DEPTH() == 2
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 2
-
- # define j_ BOOST_PP_FRAME_ITERATION(2)
- # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
-@@ -548,4 +549,5 @@ struct bind_chooser<i_>
- # undef j_
-
- #endif // BOOST_PP_ITERATION_DEPTH()
-+#endif
- #endif // BOOST_PP_IS_ITERATING
-diff --git boost_1_39_0/boost/ptr_container/detail/move.hpp boost_1_39_0/boost/ptr_container/detail/move.hpp
-index bf07d5f..6b082a7 100644
---- misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
-@@ -20,7 +20,7 @@ namespace move_ptrs {
- template<typename Ptr>
- class move_source {
- public:
-- move_source(Ptr& ptr) : ptr_(ptr) {}
-+ move_source(Ptr& _ptr) : ptr_(_ptr) {}
- Ptr& ptr() const { return ptr_; }
- private:
- Ptr& ptr_;
-diff --git boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
-index 47c3903..3ad2c5c 100644
---- misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
-@@ -278,9 +278,9 @@ namespace ptr_container_detail
-
- private:
- template< class ForwardIterator >
-- ForwardIterator advance( ForwardIterator begin, size_type n )
-+ ForwardIterator advance( ForwardIterator _begin, size_type n )
- {
-- ForwardIterator iter = begin;
-+ ForwardIterator iter = _begin;
- std::advance( iter, n );
- return iter;
- }
-diff --git boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
-index ba2b9af..9e0d682 100644
---- misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
-@@ -151,7 +151,7 @@ public:
- deleter_const_reference get_deleter() const { return impl_.second(); }
- private:
- template<typename TT, typename DD>
-- void check(const static_move_ptr<TT, DD>& ptr)
-+ void check(const static_move_ptr<TT, DD>& _ptr)
- {
- typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible;
- BOOST_STATIC_ASSERT(convertible::value);
-diff --git boost_1_39_0/boost/ptr_container/exception.hpp boost_1_39_0/boost/ptr_container/exception.hpp
-index d9a5ffe..7837fbb 100644
---- misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
-+++ misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
-@@ -24,7 +24,7 @@ namespace boost
- {
- const char* what_;
- public:
-- bad_ptr_container_operation( const char* what ) : what_( what )
-+ bad_ptr_container_operation( const char* text ) : what_( text )
- { }
-
- virtual const char* what() const throw()
-@@ -38,7 +38,7 @@ namespace boost
- class bad_index : public bad_ptr_container_operation
- {
- public:
-- bad_index( const char* what ) : bad_ptr_container_operation( what )
-+ bad_index( const char* text ) : bad_ptr_container_operation( text )
- { }
- };
-
-diff --git boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
-index 492bf4b..565fdec 100644
---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
-@@ -19,12 +19,12 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- : len(-1), val() {}
-
- template <typename T>
-- inline match<T>::match(std::size_t length)
-- : len(length), val() {}
-+ inline match<T>::match(std::size_t _length)
-+ : len(_length), val() {}
-
- template <typename T>
-- inline match<T>::match(std::size_t length, ctor_param_t val_)
-- : len(length), val(val_) {}
-+ inline match<T>::match(std::size_t _length, ctor_param_t val_)
-+ : len(_length), val(val_) {}
-
- template <typename T>
- inline bool
-@@ -66,11 +66,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- inline match<nil_t>::match()
- : len(-1) {}
-
-- inline match<nil_t>::match(std::size_t length)
-- : len(length) {}
-+ inline match<nil_t>::match(std::size_t _length)
-+ : len(_length) {}
-
-- inline match<nil_t>::match(std::size_t length, nil_t)
-- : len(length) {}
-+ inline match<nil_t>::match(std::size_t _length, nil_t)
-+ : len(_length) {}
-
- inline bool
- match<nil_t>::operator!() const
-diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
-index ca51bd2..b2282fa 100644
---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
-@@ -226,7 +226,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- template <typename ParserT, typename ScannerT, typename AttrT>
- struct concrete_parser : abstract_parser<ScannerT, AttrT>
- {
-- concrete_parser(ParserT const& p) : p(p) {}
-+ concrete_parser(ParserT const& _p) : p(_p) {}
- virtual ~concrete_parser() {}
-
- virtual typename match_result<ScannerT, AttrT>::type
-diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
-index 2f4b986..b3809da 100644
---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
-@@ -106,7 +106,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- : parser_id(reinterpret_cast<std::size_t>(this));
- }
-
-- void set_id(parser_id id) { tag = id; }
-+ void set_id(parser_id _id) { tag = _id; }
-
- private:
-
-diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
-index 73389b4..18d26cc 100644
---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
-@@ -159,11 +159,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- return ptr.get();
- }
-
-- rule(abstract_parser_t* ptr)
-- : ptr(ptr) {}
-+ rule(abstract_parser_t* _ptr)
-+ : ptr(_ptr) {}
-
-- rule(abstract_parser_t const* ptr)
-- : ptr(ptr) {}
-+ rule(abstract_parser_t const* _ptr)
-+ : ptr(_ptr) {}
-
- scoped_ptr<abstract_parser_t> ptr;
- };
-diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
-index 5d6761f..b93118a 100644
---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
-@@ -210,7 +210,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- subrule_list<
- subrule_parser<ID2, DefT2, ContextT2>,
- nil_t> >
-- operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
-+ operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
- {
- return subrule_list<
- self_t,
-@@ -220,7 +220,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- *this,
- subrule_list<
- subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
-- rhs, nil_t()));
-+ _rhs, nil_t()));
- }
-
- typename DefT::embed_t rhs;
-@@ -258,10 +258,10 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- parse_main(ScannerT const& scan) const
- {
- typedef typename parser_result<self_t, ScannerT>::type result_t;
-- result_t result;
-+ result_t _result;
- impl::parse_subrule<result_t, ScannerT, ID>::
-- do_(result, scan);
-- return result;
-+ do_(_result, scan);
-+ return _result;
- }
-
- template <typename ScannerT>
-diff --git boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
-index 5d75be2..730cf0c 100644
---- misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
-@@ -395,13 +395,13 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
- }
-
- bool register_node(void const *r, char const *name_to_register,
-- bool trace_node)
-+ bool _trace_node)
- {
- if (infos.find(r) != infos.end())
- return false;
-
- return infos.insert(rule_infos::value_type(r,
-- rule_info(std::string(name_to_register), trace_node))
-+ rule_info(std::string(name_to_register), _trace_node))
- ).second;
- }
-
---- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk
-+++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk
-@@ -1,1 +1,21 @@
--dummy
-+PRJ=..$/..$/..$/..$/..$/..$/..$/..
-+
-+PRJNAME=boostthread
-+TARGET=boostthread
-+LIBTARGET=NO
-+
-+.IF "$(GUI)"=="WNT"
-+
-+.INCLUDE : settings.mk
-+
-+SLOFILES= $(SLO)$/exceptions.obj \
-+ $(SLO)$/thread.obj \
-+ $(SLO)$/tss_dll.obj \
-+ $(SLO)$/tss_pe.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE : target.mk
-+.ENDIF
diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch
new file mode 100644
index 0000000..99e24de
--- /dev/null
+++ b/boost/boost_1_44_0.patch
@@ -0,0 +1,25 @@
+--- misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk
++++ misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk
+@@ -1,1 +1,21 @@
+-dummy
++PRJ=..$/..$/..$/..$/..$/..$/..$/..
++
++PRJNAME=boostthread
++TARGET=boostthread
++LIBTARGET=NO
++
++.IF "$(GUI)"=="WNT"
++
++.INCLUDE : settings.mk
++
++SLOFILES= $(SLO)$/exceptions.obj \
++ $(SLO)$/thread.obj \
++ $(SLO)$/tss_dll.obj \
++ $(SLO)$/tss_pe.obj
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE : target.mk
++.ENDIF
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 8602cf9..2d25dc3 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -48,11 +48,11 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=boost_1_39_0
-TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7
+TARFILE_NAME=boost_1_44_0
+TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
PATCH_FILES=$(TARFILE_NAME).patch
# See https://svn.boost.org/trac/boost/ticket/3780
-PATCH_FILES+=aliasing.patch
+#PATCH_FILES+=aliasing.patch
#https://svn.boost.org/trac/boost/ticket/4713
PATCH_FILES+=boost.4713.warnings.patch
More information about the Libreoffice-commits
mailing list