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

RepositoryExternal.mk

@@ -556,6 +556,24 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+define gb_LinkTarget__use_boostsystem
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(BOOST_CPPFLAGS) \
+)
+
+$(call gb_LinkTarget_add_ldflags,$(1),\
+	$(BOOST_LDFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(BOOST_SYSTEM_LIB) \
+)
+
+endef
+
+gb_ExternalProject__use_boostsystem :=
+
 define gb_LinkTarget__use_boost_headers
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
@@ -570,6 +588,7 @@ else # !SYSTEM_BOOST
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	boostdatetime \
+	boostsystem \
 ))
 
 ifeq ($(OS),WNT)
@@ -600,6 +619,21 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
+define gb_LinkTarget__use_boostsystem
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DBOOST_ALL_NO_LIB \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+	boostsystem \
+)
+
+endef
+
+define gb_ExternalProject__use_boostsystem
+$(call gb_LinkTarget_use_static_libraries,$(1),boostsystem)
+endef
+
 define gb_LinkTarget__use_boost_headers
 $(call gb_LinkTarget_use_unpacked,$(1),boost)
 $(call gb_LinkTarget_set_include,$(1),\

boost/Module_boost.mk

@@ -13,6 +13,7 @@ ifeq ($(SYSTEM_BOOST),NO)
 
 $(eval $(call gb_Module_add_targets,boost,\
 	StaticLibrary_boostdatetime \
+	StaticLibrary_boostsystem \
 	UnpackedTarball_boost \
 ))
 

boost/StaticLibrary_boostsystem.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,boostsystem))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostsystem))
+
+# disable "auto link" "feature" on MSVC
+$(eval $(call gb_StaticLibrary_add_defs,boostsystem,\
+	-DBOOST_ALL_NO_LIB \
+))
+
+$(eval $(call gb_StaticLibrary_use_external,boostsystem,boost_headers))
+
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostsystem,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostsystem,\
+	UnpackedTarball/boost/libs/system/src/error_code \
+))
+
+# vim: set noet sw=4 ts=4:

boost/UnpackedTarball_boost.mk

@@ -8,64 +8,40 @@
 #
 
 boost_patches :=
-#https://svn.boost.org/trac/boost/ticket/3093
-boost_patches += boost.3093.warnings.patch
 #https://svn.boost.org/trac/boost/ticket/3780
 boost_patches += boost.3780.aliasing.patch
-#https://svn.boost.org/trac/boost/ticket/4127
-boost_patches += boost.4127.warnings.patch
 #https://svn.boost.org/trac/boost/ticket/4713
 boost_patches += boost.4713.warnings.patch
-#https://svn.boost.org/trac/boost/ticket/5119
-boost_patches += boost.5119.unordered_map-cp-ctor.patch
 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
 boost_patches += boost.gcc47679.patch
 #https://svn.boost.org/trac/boost/ticket/6369
 boost_patches += boost.6369.warnings.patch
 #https://svn.boost.org/trac/boost/ticket/6397
 boost_patches += boost.6397.warnings.patch
-#backport from boost 1.48.0 fix for "opcode not supported on this processor"
-boost_patches += boost.mipsbackport.patch
 #https://svn.boost.org/trac/boost/ticket/7551
 boost_patches += boost.7551.unusedvars.patch
 boost_patches += boost.4100.warnings.patch
 boost_patches += boost.4510.warnings.patch
-#https://svn.boost.org/trac/boost/ticket/6139
-boost_patches += boost.6139.clang.patch
-#https://svn.boost.org/trac/boost/ticket/6940
-boost_patches += boost.6940.glibc.patch
-#https://svn.boost.org/trac/boost/ticket/7774
-boost_patches += boost.7774.warnings.patch.1
 #https://svn.boost.org/trac/boost/ticket/6142
 boost_patches += boost.6142.warnings.patch.1
-boost_patches += boost.wundef.patch.1
-
-boost_patches += boost.windows.patch
-boost_patches += boost.vc2012.patch
 boost_patches += boost.libcdr.warnings.patch.1
 
 # Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
 ifeq (GCC,$(COM))
 boost_patches += boost_1_44_0-unused-parameters.patch
-boost_patches += boost_1_44_0-logical-op-parentheses.patch
 endif
 
-# Backporting fixes for the GCC 4.7 -std=c++11 mode from Boost 1.48.0:
-boost_patches += boost_1_44_0-gcc4.7.patch
-
 # Clang warnings:
 boost_patches += boost_1_44_0-clang-warnings.patch
 
-# Backport http://svn.boost.org/svn/boost/trunk r76133 "Fix threading detection
-# in GCC-4.7 experimental":
-boost_patches += boost_1_44_0-gthreads.patch
-
 boost_patches += boost_1_44_0-gcc4.8.patch
 
 # https://svn.boost.org/trac/boost/changeset/78496
 boost_patches += boost.4874.patch
 
-boost_patches += boost.ptree.patch
+boost_patches += boost.loplugin.patch
+boost_patches += boost.wundef.patch
+boost_patches += boost.wshadow.patch
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 

boost/boost.3093.warnings.patch

---- misc/boost_1_44_0/boost/logic/tribool.hpp	Sun Nov 25 18:07:19 2007
-+++ misc/build/boost_1_44_0/boost/logic/tribool.hpp	Fri May 17 12:03:35 2013
-@@ -93,7 +93,7 @@
-    *
-    * \throws nothrow
-    */
--  tribool(bool value) : value(value? true_value : false_value) {}
-+  tribool(bool initial_value) : value(initial_value? true_value : false_value) {}
- 
-   /**
-    * Construct a new 3-state boolean value with an indeterminate value.

boost/boost.3780.aliasing.patch

 --- misc/boost_1_44_0/boost/function/function_base.hpp
 +++ misc/build/boost_1_44_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);
+             new (reinterpret_cast<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();
+-              functor_type* f = reinterpret_cast<functor_type*>(&in_buffer.data);
++              functor_type* f = static_cast<functor_type*>(static_cast<void*>(&in_buffer.data));
+               (void)f; // suppress warning about the value of f not being used (MSVC)
+               f->~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();
+-             functor_type* f = reinterpret_cast<functor_type*>(&out_buffer.data);
++             functor_type* f = static_cast<functor_type*>(static_cast<void*>(&out_buffer.data));
+              (void)f; // suppress warning about the value of f not being used (MSVC)
+              f->~Functor();
            } else if (op == check_functor_type_tag) {
-             const detail::sp_typeinfo& check_type 
-               = *out_buffer.type.type;

boost/boost.4127.warnings.patch

---- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp
-+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp
-@@ -49,7 +49,18 @@
-     {
-         if( initialized_ )
-         {
-+#if defined( __GNUC__ )
-+
-+            // fixes incorrect aliasing warning
-+            T * p = reinterpret_cast< T* >( storage_.data_ );
-+            p->~T();
-+
-+#else
-+
-             reinterpret_cast< T* >( storage_.data_ )->~T();
-+
-+#endif
-+
-             initialized_ = false;
-         }
-     }

boost/boost.4874.patch

@@ -10,14 +10,6 @@ Index: branches/release/boost/multi_array/base.hpp
  #include "boost/multi_array/extent_range.hpp"
  #include "boost/multi_array/extent_gen.hpp"
  #include "boost/multi_array/index_range.hpp"
-@@ -82,5 +82,6 @@
- class const_sub_array;
- 
--template <typename T, typename TPtr, typename NumDims, typename Reference>
-+  template <typename T, typename TPtr, typename NumDims, typename Reference,
-+            typename IteratorCategory>
- class array_iterator;
- 
 @@ -252,5 +253,17 @@
  /////////////////////////////////////////////////////////////////////////
  
@@ -37,23 +29,6 @@ Index: branches/release/boost/multi_array/base.hpp
 +#endif
  
  ////////////////////////////////////////////////////////////////////////
-@@ -302,6 +315,14 @@
-   // iterator support
-   //
--  typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference> iterator;
--  typedef array_iterator<T,T const*,mpl::size_t<NumDims>,const_reference> const_iterator;
-+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600)
-+  // Deal with VC 2010 output_iterator_tag requirement
-+  typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference,
-+                         mutable_iterator_tag> iterator;
-+#else
-+  typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference,
-+                         boost::random_access_traversal_tag> iterator;
-+#endif
-+  typedef array_iterator<T,T const*,mpl::size_t<NumDims>,const_reference,
-+                         boost::random_access_traversal_tag> const_iterator;
- 
-   typedef ::boost::reverse_iterator<iterator> reverse_iterator;
 @@ -322,5 +343,6 @@
                             const index* strides,
                             const index* index_bases) const {
@@ -62,23 +37,6 @@ Index: branches/release/boost/multi_array/base.hpp
 +      detail::multi_array::CollectionConcept<IndexList> >();
      ignore_unused_variable_warning(index_bases);
      ignore_unused_variable_warning(extents);
-@@ -333,7 +355,13 @@
- 
-     index offset = 0;
--    for (size_type n = 0; n != NumDims; ++n) 
--      offset += indices[n] * strides[n];
--    
-+    {
-+      typename IndexList::const_iterator i = indices.begin();
-+      size_type n = 0; 
-+      while (n != NumDims) {
-+        offset += (*i) * strides[n];
-+        ++n;
-+        ++i;
-+      }
-+    }
-     return base[offset];
-   }
 Index: branches/release/boost/multi_array/concept_checks.hpp
 ===================================================================
 --- a/branches/release/boost/multi_array/concept_checks.hpp
@@ -89,52 +47,3 @@ Index: branches/release/boost/multi_array/concept_checks.hpp
 +      function_requires< boost::OutputIterator<iterator,value_type> >();
        
        // RG - a( CollectionArchetype) when available...
-Index: branches/release/boost/multi_array/iterator.hpp
-===================================================================
---- a/branches/release/boost/multi_array/iterator.hpp
-+++ b/branches/release/boost/multi_array/iterator.hpp
-@@ -45,14 +45,16 @@
- };
- 
--template <typename T, typename TPtr, typename NumDims, typename Reference>
-+template <typename T, typename TPtr, typename NumDims, typename Reference,
-+          typename IteratorCategory>
- class array_iterator;
- 
--template <typename T, typename TPtr, typename NumDims, typename Reference>
-+template <typename T, typename TPtr, typename NumDims, typename Reference,
-+          typename IteratorCategory>
- class array_iterator
-   : public
-     iterator_facade<
--        array_iterator<T,TPtr,NumDims,Reference>
-+        array_iterator<T,TPtr,NumDims,Reference,IteratorCategory>
-       , typename associated_types<T,NumDims>::value_type
--      , boost::random_access_traversal_tag
-+      , IteratorCategory
-       , Reference
-     >
-@@ -70,5 +72,5 @@
- 
-   typedef iterator_facade<
--        array_iterator<T,TPtr,NumDims,Reference>
-+            array_iterator<T,TPtr,NumDims,Reference,IteratorCategory>
-       , typename detail::multi_array::associated_types<T,NumDims>::value_type
-       , boost::random_access_traversal_tag
-@@ -80,5 +82,5 @@
- 
- #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
--  template <typename, typename, typename, typename>
-+  template <typename, typename, typename, typename, typename>
-     friend class array_iterator;
- #else
-@@ -106,7 +108,7 @@
-     strides_(strides), index_base_(index_base) { }
- 
--  template <typename OPtr, typename ORef>
-+  template <typename OPtr, typename ORef, typename Cat>
-   array_iterator(
--      const array_iterator<T,OPtr,NumDims,ORef>& rhs
-+      const array_iterator<T,OPtr,NumDims,ORef,Cat>& rhs
-     , typename boost::enable_if_convertible<OPtr,TPtr>::type* = 0
-   )

boost/boost.5119.unordered_map-cp-ctor.patch

-Index: /trunk/boost/unordered/unordered_set.hpp
-===================================================================
---- misc/boost_1_44_0/boost/unordered/unordered_set.hpp	(revision 60754)
-+++ misc/build/boost_1_44_0/boost/unordered/unordered_set.hpp	(revision 68445)
-@@ -155,4 +155,9 @@
- 
- #if !defined(BOOST_NO_RVALUE_REFERENCES)
-+        unordered_set(unordered_set const& other)
-+          : table_(other.table_)
-+        {
-+        }
-+
-         unordered_set(unordered_set&& other)
-           : table_(other.table_, boost::unordered_detail::move_tag())
-@@ -163,4 +168,10 @@
-           : table_(other.table_, a, boost::unordered_detail::move_tag())
-         {
-+        }
-+
-+        unordered_set& operator=(unordered_set const& x)
-+        {
-+            table_ = x.table_;
-+            return *this;
-         }
- 
-@@ -652,4 +663,9 @@
- 
- #if !defined(BOOST_NO_RVALUE_REFERENCES)
-+        unordered_multiset(unordered_multiset const& other)
-+          : table_(other.table_)
-+        {
-+        }
-+
-         unordered_multiset(unordered_multiset&& other)
-           : table_(other.table_, boost::unordered_detail::move_tag())
-@@ -660,4 +676,10 @@
-           : table_(other.table_, a, boost::unordered_detail::move_tag())
-         {
-+        }
-+
-+        unordered_multiset& operator=(unordered_multiset const& x)
-+        {
-+            table_ = x.table_;
-+            return *this;
-         }
- 
-Index: /trunk/boost/unordered/unordered_map.hpp
-===================================================================
---- misc/boost_1_44_0/boost/unordered/unordered_map.hpp	(revision 60754)
-+++ misc/build/boost_1_44_0/boost/unordered/unordered_map.hpp	(revision 68445)
-@@ -161,4 +161,9 @@
- 
- #if !defined(BOOST_NO_RVALUE_REFERENCES)
-+        unordered_map(unordered_map const& other)
-+          : table_(other.table_)
-+        {
-+        }
-+
-         unordered_map(unordered_map&& other)
-           : table_(other.table_, boost::unordered_detail::move_tag())
-@@ -169,4 +174,10 @@
-           : table_(other.table_, a, boost::unordered_detail::move_tag())
-         {
-+        }
-+
-+        unordered_map& operator=(unordered_map const& x)
-+        {
-+            table_ = x.table_;
-+            return *this;
-         }
- 
-@@ -706,4 +717,9 @@
- 
- #if !defined(BOOST_NO_RVALUE_REFERENCES)
-+        unordered_multimap(unordered_multimap const& other)
-+          : table_(other.table_)
-+        {
-+        }
-+
-         unordered_multimap(unordered_multimap&& other)
-           : table_(other.table_, boost::unordered_detail::move_tag())
-@@ -714,4 +730,10 @@
-           : table_(other.table_, a, boost::unordered_detail::move_tag())
-         {
-+        }
-+
-+        unordered_multimap& operator=(unordered_multimap const& x)
-+        {
-+            table_ = x.table_;
-+            return *this;
-         }
- 

boost/boost.6139.clang.patch

---- misc/build/boost/boost/detail/container_fwd.hpp	2013-04-02 19:13:58.744000000 -0400
-+++ misc/build/boost/boost/detail/container_fwd.hpp	2013-04-02 19:23:13.504000000 -0400
-@@ -17,6 +17,7 @@
-     || ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
-         && (defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL))) \
-     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
-+    || __GLIBCXX__ >= 20070513 \
-     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
-     || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
- 

boost/boost.6369.warnings.patch

@@ -321,24 +321,3 @@
                  ).second;
              }
 
---- misc/boost_1_44_0/boost/variant/variant.hpp	2012-01-08 20:16:41.321760852 +0000
-+++ misc/build/boost_1_44_0/boost/variant/variant.hpp	2012-01-08 20:25:43.233484675 +0000
-@@ -1143,14 +1143,14 @@
-     which_t which_;
-     storage_t storage_;
- 
--    void indicate_which(int which)
-+    void indicate_which(int i_which)
-     {
--        which_ = static_cast<which_t>( which );
-+        which_ = static_cast<which_t>( i_which );
-     }
- 
--    void indicate_backup_which(int which)
-+    void indicate_backup_which(int i_which)
-     {
--        which_ = static_cast<which_t>( -(which + 1) );
-+        which_ = static_cast<which_t>( -(i_which + 1) );
-     }
- 
- private: // helpers, for queries (below)

boost/boost.6397.warnings.patch

@@ -19,25 +19,6 @@
      {
          process_bit( static_cast<bool>(bits & high_bit_mask) );
      }
---- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp	2012-01-12 20:21:29.790009198 +0000
-+++ misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp	2012-01-12 20:28:55.457287835 +0000
-@@ -43,11 +43,11 @@
-       i = c.end();
-       c.swap(c);
-     }
--    void const_constraints(const Collection& c) {
--      ci = c.begin();
--      ci = c.end();
--      n = c.size();
--      b = c.empty();
-+    void const_constraints(const Collection& c_) {
-+      ci = c_.begin();
-+      ci = c_.end();
-+      n = c_.size();
-+      b = c_.empty();
-     }
-     Collection c;
-     bool b;
 --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp	2012-01-12 20:21:29.790009198 +0000
 +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp	2012-01-12 20:29:56.482879277 +0000
 @@ -39,8 +39,8 @@
@@ -72,12 +53,12 @@
        //      value_type vt = a[ id ];
  
        // Test slicing, keeping only the first dimension, losing the rest
--      idgen_helper<NumDims-1>::call(a,idgen[range],id);
-+      idgen_helper<NumDims-1>::call(a_,idgen[range],id);
+-      detail::idgen_helper<NumDims-1>::call(a,idgen[range],id);
++      detail::idgen_helper<NumDims-1>::call(a_,idgen[range],id);
  
        // Test slicing, keeping all dimensions.
--      idgen_helper<NumDims-1>::call(a,idgen[range],range);
-+      idgen_helper<NumDims-1>::call(a_,idgen[range],range);
+-      detail::idgen_helper<NumDims-1>::call(a,idgen[range],range);
++      detail::idgen_helper<NumDims-1>::call(a_,idgen[range],range);
  
 -      st = a.size();
 -      st = a.num_dimensions();
@@ -161,7 +142,7 @@
 +  explicit const_multi_array_ref(TPtr base, const ExtentList& extents_) :
      base_(base), storage_(c_storage_order()) {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<ExtentList> >();
+       CollectionConcept<ExtentList> >();
  
      index_base_list_.assign(0);
 -    init_multi_array_ref(extents.begin());
@@ -174,7 +155,7 @@
                         const general_storage_order<NumDims>& so) : 
      base_(base), storage_(so) {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<ExtentList> >();
+       CollectionConcept<ExtentList> >();
  
      index_base_list_.assign(0);
 -    init_multi_array_ref(extents.begin());
@@ -206,7 +187,7 @@
 -  void reshape(const SizeList& extents) {
 +  void reshape(const SizeList& extents_) {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<SizeList> >();
+       CollectionConcept<SizeList> >();
      BOOST_ASSERT(num_elements_ ==
 -                 std::accumulate(extents.begin(),extents.end(),
 +                 std::accumulate(extents_.begin(),extents_.end(),
@@ -224,7 +205,7 @@
 -  const element& operator()(IndexList indices) const {
 +  const element& operator()(IndexList indices_) const {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<IndexList> >();
+       CollectionConcept<IndexList> >();
      return super_type::access_element(boost::type<const element&>(),
 -                                      indices,origin(),
 +                                      indices_,origin(),
@@ -299,7 +280,7 @@
 +  explicit multi_array_ref(T* base, const ExtentList& extents_) :
 +    super_type(base,extents_) {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<ExtentList> >();
+       CollectionConcept<ExtentList> >();
    }
  
    template <class ExtentList>
@@ -309,7 +290,7 @@
 -    super_type(base,extents,so) {
 +    super_type(base,extents_,so) {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<ExtentList> >();
+       CollectionConcept<ExtentList> >();
    }
 @@ -509,11 +509,11 @@
    element* data() { return super_type::base_; }
@@ -318,7 +299,7 @@
 -  element& operator()(const IndexList& indices) {
 +  element& operator()(const IndexList& indices_) {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<IndexList> >();
+       CollectionConcept<IndexList> >();
      return super_type::access_element(boost::type<element&>(),
 -                                      indices,origin(),
 +                                      indices_,origin(),
@@ -346,7 +327,7 @@
 -  const element& operator()(const IndexList& indices) const {
 +  const element& operator()(const IndexList& indices_) const {
      boost::function_requires<
-       detail::multi_array::CollectionConcept<IndexList> >();
+       CollectionConcept<IndexList> >();
 -    return super_type::operator()(indices);
 +    return super_type::operator()(indices_);
    }
@@ -534,27 +515,33 @@
                     new_array.index_base_list_.end(),
 --- misc/boost_1_44_0/boost/random/mersenne_twister.hpp
 +++ misc/build/boost_1_44_0/boost/random/mersenne_twister.hpp
-@@ -195,16 +195,16 @@
-   }
- #endif
- 
--  friend bool operator==(const mersenne_twister& x, const mersenne_twister& y)
-+  friend bool operator==(const mersenne_twister& x_, const mersenne_twister& y_)
-   {
-     for(int j = 0; j < state_size; ++j)
--      if(x.compute(j) != y.compute(j))
-+      if(x_.compute(j) != y_.compute(j))
-         return false;
-     return true;
-   }
- 
--  friend bool operator!=(const mersenne_twister& x, const mersenne_twister& y)
--  { return !(x == y); }
-+  friend bool operator!=(const mersenne_twister& x_, const mersenne_twister& y_)
-+  { return !(x_ == y_); }
- #else
-   // Use a member function; Streamable concept not supported.
-   bool operator==(const mersenne_twister& rhs) const
+@@ -195,19 +195,19 @@
+      * Returns true if the two generators are in the same state,
+      * and will thus produce identical sequences.
+      */
+-    friend bool operator==(const mersenne_twister_engine& x,
+-                           const mersenne_twister_engine& y)
++    friend bool operator==(const mersenne_twister_engine& x_arg,
++                           const mersenne_twister_engine& y_arg)
+     {
+-        if(x.i < y.i) return x.equal_imp(y);
+-        else return y.equal_imp(x);
++        if(x_arg.i < y_arg.i) return x_arg.equal_imp(y_arg);
++        else return y_arg.equal_imp(x_arg);
+     }
+     
+     /**
+      * Returns true if the two generators are in different states.
+      */
+-    friend bool operator!=(const mersenne_twister_engine& x,
+-                           const mersenne_twister_engine& y)
+-    { return !(x == y); }
++    friend bool operator!=(const mersenne_twister_engine& x_arg,
++                           const mersenne_twister_engine& y_arg)
++    { return !(x_arg == y_arg); }
+ 
+ private:
+     /// \cond show_private
 --- misc/boost_1_44_0/boost/uuid/uuid_io.hpp
 +++ misc/build/boost_1_44_0/boost/uuid/uuid_io.hpp
 @@ -59,7 +59,7 @@

boost/boost.6940.glibc.patch

---- misc/boost_1_44_0/boost/thread/xtime.hpp	2012-11-05 20:13:28.034300778 -0500
-+++ misc/build/boost_1_44_0/boost/thread/xtime.hpp	2012-11-05 20:13:50.856322691 -0500
-@@ -20,7 +20,7 @@
-
- enum xtime_clock_types
- {
--    TIME_UTC=1
-+    TIME_UTC_=1
- //    TIME_TAI,
- //    TIME_MONOTONIC,
- //    TIME_PROCESS,
-@@ -68,7 +68,7 @@
-
- inline int xtime_get(struct xtime* xtp, int clock_type)
- {
--    if (clock_type == TIME_UTC)
-+    if (clock_type == TIME_UTC_)
-     {
-         *xtp=get_xtime(get_system_time());
-         return clock_type;

boost/boost.7774.warnings.patch.1

-diff -ur boost.org/boost/random/binomial_distribution.hpp boost/boost/random/binomial_distribution.hpp
---- boost.org/boost/random/binomial_distribution.hpp	2012-12-07 21:17:45.789067382 +0100
-+++ boost/boost/random/binomial_distribution.hpp	2012-12-07 21:42:39.915034045 +0100
-@@ -42,12 +42,12 @@
-    *
-    * Requires: t >=0 && 0 <= p <= 1
-    */
--  explicit binomial_distribution(IntType t = 1,
--                                 const RealType& p = RealType(0.5))
--    : _bernoulli(p), _t(t)
-+  explicit binomial_distribution(IntType t_arg = 1,
-+                                 const RealType& p_arg = RealType(0.5))
-+    : _bernoulli(p_arg), _t(t_arg)
-   {
-     assert(_t >= 0);
--    assert(RealType(0) <= p && p <= RealType(1));
-+    assert(RealType(0) <= p_arg && p_arg <= RealType(1));
-   }
- 
-   // compiler-generated copy ctor and assignment operator are fine
-diff -ur boost.org/boost/random/geometric_distribution.hpp boost/boost/random/geometric_distribution.hpp
---- boost.org/boost/random/geometric_distribution.hpp	2012-12-07 21:17:45.789067382 +0100
-+++ boost/boost/random/geometric_distribution.hpp	2012-12-07 21:41:34.970035494 +0100
-@@ -50,8 +50,8 @@
-    *
-    * Requires: 0 < p < 1
-    */
--  explicit geometric_distribution(const RealType& p = RealType(0.5))
--    : _p(p)
-+  explicit geometric_distribution(const RealType& p_arg = RealType(0.5))
-+    : _p(p_arg)
-   {
-     assert(RealType(0) < _p && _p < RealType(1));
-     init();

boost/boost.gcc47679.patch

@@ -56,6 +56,6 @@
 +      memset(&dummy_, 0, sizeof(dummy_));
 +    }
 +
-     void const* address() const { return &dummy_.data[0]; }
-     void      * address()       { return &dummy_.data[0]; }
- } ;
+ #if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
+     void const* address() const { return &dummy_; }
+     void      * address()       { return &dummy_; }

boost/boost.libcdr.warnings.patch.1

---- boost/boost/archive/basic_archive.hpp	2010-08-11 20:15:46.000000000 +0200
-+++ boost/boost/archive/basic_archive.hpp	2013-05-17 15:39:58.624333369 +0200
-@@ -54,7 +54,7 @@
-         return *this;
-     }
-     // used for text output
--    operator const base_type () const {
-+    operator base_type () const {
-         return t;
-     }                
-     // used for text input
-@@ -90,7 +90,7 @@
-         return *this;
-     }
-     // used for text output
--    operator const base_type () const {
-+    operator base_type () const {
-         return t;
-     }                
-     // used for text intput
-@@ -127,7 +127,7 @@
-     }
- 
-     // used for text output
--    operator const int () const {
-+    operator int () const {
-         return t;
-     }                
-     // used for text input
-@@ -161,7 +161,7 @@
-         return *this;
-     }
-     // used for text output
--    operator const uint_least32_t () const {
-+    operator uint_least32_t () const {
-         return t;
-     }                
-     // used for text input
-@@ -254,7 +254,7 @@
- #define BOOST_ARCHIVE_STRONG_TYPEDEF(T, D)         \
-     class D : public T {                           \
-     public:                                        \
--        explicit D(const T t) : T(t){}             \
-+        explicit D(const T t_) : T(t_){}             \
-     };                                             \
- /**/
- 
 --- boost/boost/multi_index/detail/index_matcher.hpp	2008-07-03 18:51:53.000000000 +0200
 +++ boost/boost/multi_index/detail/index_matcher.hpp	2013-05-17 15:30:12.539099597 +0200
 @@ -132,17 +132,17 @@
@@ -236,92 +189,6 @@
    }
  #endif
  
---- boost/boost/property_tree/detail/exception_implementation.hpp	2009-09-01 23:27:45.000000000 +0200
-+++ boost/boost/property_tree/detail/exception_implementation.hpp	2013-05-17 15:28:28.599529530 +0200
-@@ -30,8 +30,8 @@
-     ///////////////////////////////////////////////////////////////////////////
-     // ptree_error
- 
--    inline ptree_error::ptree_error(const std::string &what): 
--        std::runtime_error(what) 
-+    inline ptree_error::ptree_error(const std::string &what_): 
-+        std::runtime_error(what_) 
-     {
-     }
- 
-@@ -43,8 +43,8 @@
-     // ptree_bad_data
- 
-     template<class D> inline
--    ptree_bad_data::ptree_bad_data(const std::string &what, const D &data):
--        ptree_error(what), m_data(data)
-+    ptree_bad_data::ptree_bad_data(const std::string &what_, const D &data_):
-+        ptree_error(what_), m_data(data_)
-     {
-     }
- 
-@@ -62,8 +62,8 @@
-     // ptree_bad_path
- 
-     template<class P> inline
--    ptree_bad_path::ptree_bad_path(const std::string &what, const P &path):
--        ptree_error(detail::prepare_bad_path_what(what, path)), m_path(path)
-+    ptree_bad_path::ptree_bad_path(const std::string &what_, const P &path_):
-+        ptree_error(detail::prepare_bad_path_what(what_, path_)), m_path(path_)
-     {
- 
-     }
---- boost/boost/property_tree/detail/file_parser_error.hpp	2009-09-01 23:27:45.000000000 +0200
-+++ boost/boost/property_tree/detail/file_parser_error.hpp	2013-05-17 15:36:01.615914822 +0200
-@@ -26,11 +26,11 @@
-         // Construction & destruction
- 
-         // Construct error
--        file_parser_error(const std::string &message,
--                          const std::string &filename,
--                          unsigned long line) :
--            ptree_error(format_what(message, filename, line)),
--            m_message(message), m_filename(filename), m_line(line)
-+        file_parser_error(const std::string &message_,
-+                          const std::string &filename_,
-+                          unsigned long line_) :
-+            ptree_error(format_what(message_, filename_, line_)),
-+            m_message(message_), m_filename(filename_), m_line(line_)
-         {
-         }
- 
-@@ -69,20 +69,20 @@
-         unsigned long m_line;
- 
-         // Format error message to be returned by std::runtime_error::what()
--        std::string format_what(const std::string &message,
--                                const std::string &filename,
--                                unsigned long line)
-+        std::string format_what(const std::string &message_,
-+                                const std::string &filename_,
-+                                unsigned long line_)
-         {
-             std::stringstream stream;
--            if (line > 0)
--                stream << (filename.empty() ? "<unspecified file>"
--                                            : filename.c_str())
--                       << '(' << line << "): "
--                       << message;
-+            if (line_ > 0)
-+                stream << (filename_.empty() ? "<unspecified file>"
-+                                            : filename_.c_str())
-+                       << '(' << line_ << "): "
-+                       << message_;
-             else
--                stream << (filename.empty() ? "<unspecified file>"
--                                            : filename.c_str())
--                       << ": " << message;
-+                stream << (filename_.empty() ? "<unspecified file>"
-+                                            : filename_.c_str())
-+                       << ": " << message_;
-             return stream.str();
-         }
- 
 --- boost/boost/property_tree/detail/json_parser_error.hpp	2007-05-13 00:02:53.000000000 +0200
 +++ boost/boost/property_tree/detail/json_parser_error.hpp	2013-05-17 15:36:44.605902442 +0200
 @@ -20,10 +20,10 @@
@@ -417,17 +284,6 @@
                  u = (std::min)(u, static_cast<unsigned long>((std::numeric_limits<Ch>::max)()));
 --- boost/boost/property_tree/detail/ptree_implementation.hpp	2010-07-03 22:59:45.000000000 +0200
 +++ boost/boost/property_tree/detail/ptree_implementation.hpp	2013-05-17 15:55:56.449713452 +0200
-@@ -183,8 +183,8 @@
-     }
- 
-     template<class K, class D, class C> inline
--    basic_ptree<K, D, C>::basic_ptree(const data_type &data)
--        : m_data(data), m_children(new typename subs::base_container)
-+    basic_ptree<K, D, C>::basic_ptree(const data_type &data_)
-+        : m_data(data_), m_children(new typename subs::base_container)
-     {
-     }
- 
 @@ -539,48 +539,48 @@
  
      template<class K, class D, class C>
@@ -582,7 +438,7 @@
      }
  
      template<class K, class D, class C>
-@@ -759,17 +759,17 @@
+@@ -759,18 +759,18 @@
          std::basic_string<Ch>
      >::type
      basic_ptree<K, D, C>::get(
@@ -601,7 +457,8 @@
      {
 -        if (optional<const self_type&> child = get_child_optional(path))
 +        if (optional<const self_type&> child = get_child_optional(path_))
-             return child.get().BOOST_NESTED_TEMPLATE get_value_optional<Type>(tr);
+             return child.get().
+                 BOOST_NESTED_TEMPLATE get_value_optional<Type>(tr);
          else
              return optional<Type>();
 @@ -778,9 +778,9 @@
@@ -668,17 +525,6 @@
                     typename translator_between<data_type, Type>::type());
      }
  
---- boost/boost/serialization/collection_size_type.hpp	2010-07-09 18:50:03.000000000 +0200
-+++ boost/boost/serialization/collection_size_type.hpp	2013-05-17 15:40:32.789528782 +0200
-@@ -37,7 +37,7 @@
-         return *this;
-     }
-     // used for text output
--    operator const base_type () const {
-+    operator base_type () const {
-         return t;
-     }                
-     // used for text input
 --- boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2013-05-17 15:57:23.722638823 +0200
 +++ boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2013-05-17 15:26:32.319247352 +0200
 @@ -126,8 +126,8 @@

boost/boost.loplugin.patch

+--- foo/foo/foo/boost/lexical_cast.hpp
++++ foo/foo/foo/boost/lexical_cast.hpp
+@@ -1016,7 +1016,7 @@
+                 if( !has_minus ) value = std::numeric_limits<T>::quiet_NaN();
+                 else value = (boost::math::changesign) (std::numeric_limits<T>::quiet_NaN());
+                 return true;
+-            } else
++            } else {
+             if (( /* 'INF' or 'inf' */
+                   end-begin==3
+                   &&
+@@ -1031,6 +1031,7 @@
+                 else value = (boost::math::changesign) (std::numeric_limits<T>::infinity());
+                 return true;
+             }
++            }
+ 
+             return false;
+         }

boost/boost.mipsbackport.patch

---- misc/boost_1_44_0/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp	2009-03-27 13:10:46.000000000 +0000
-+++ misc/build/boost_1_44_0/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp	2011-11-07 14:25:23.000000000 +0000
-@@ -37,9 +37,12 @@
-     __asm__ __volatile__
-     (
-         "0:\n\t"
-+        ".set push\n\t"
-+        ".set mips2\n\t"
-         "ll %0, %1\n\t"
-         "addiu %0, 1\n\t"
-         "sc %0, %1\n\t"
-+        ".set pop\n\t"
-         "beqz %0, 0b":
-         "=&r"( tmp ), "=m"( *pw ):
-         "m"( *pw )
-@@ -55,9 +58,12 @@
-     __asm__ __volatile__
-     (
-         "0:\n\t"
-+        ".set push\n\t"
-+        ".set mips2\n\t"
-         "ll %1, %2\n\t"
-         "addiu %0, %1, -1\n\t"
-         "sc %0, %2\n\t"
-+        ".set pop\n\t"
-         "beqz %0, 0b\n\t"
-         "addiu %0, %1, -1":
-         "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ):
-@@ -78,10 +84,13 @@
-     __asm__ __volatile__
-     (
-         "0:\n\t"
-+        ".set push\n\t"
-+        ".set mips2\n\t"
-         "ll %0, %2\n\t"
-         "beqz %0, 1f\n\t"
-         "addiu %1, %0, 1\n\t"
-         "sc %1, %2\n\t"
-+        ".set pop\n\t"
-         "beqz %1, 0b\n\t"
-         "addiu %0, %0, 1\n\t"
-         "1:":

boost/boost.ptree.patch

---- misc/build/boost_1_44_0/boost/property_tree/detail/json_parser_read.hpp	2013-04-22 18:22:16.961642320 +0200
-+++ misc/build/boost_1_44_0/boost/property_tree/detail/json_parser_read.hpp	2013-04-22 18:22:59.991632602 +0200
-@@ -102,7 +102,7 @@
-             void operator()(It b, It e) const
-             {
-                 BOOST_ASSERT(c.stack.size() >= 1);
--                c.stack.back()->push_back(std::make_pair(c.name, Str(b, e)));
-+                c.stack.back()->push_back(std::make_pair(c.name, Ptree(Str(b, e))));
-                 c.name.clear();
-                 c.string.clear();
-             }

boost/boost.wundef.patch

+--- foo/foo/foo/boost/multi_array/base.hpp
++++ foo/foo/foo/boost/multi_array/base.hpp
+@@ -65,7 +65,7 @@
+ // object creation in small-memory environments.  Thus, the objects
+ // can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS 
+ // before loading multi_array.hpp.
+-#if !BOOST_MULTI_ARRAY_NO_GENERATORS
++#if !defined(BOOST_MULTI_ARRAY_NO_GENERATORS) || !BOOST_MULTI_ARRAY_NO_GENERATORS
+ namespace {
+   multi_array_types::extent_gen extents;
+   multi_array_types::index_gen indices;
+--- foo/foo/foo/boost/preprocessor/tuple/elem.hpp
++++ foo/foo/foo/boost/preprocessor/tuple/elem.hpp
+@@ -22,7 +22,7 @@
+ # include <boost/preprocessor/variadic/elem.hpp>
+ #
+ # if BOOST_PP_VARIADICS
+-#    if BOOST_PP_VARIADICS_MSVC
++#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
+ #        define BOOST_PP_TUPLE_ELEM(...) BOOST_PP_TUPLE_ELEM_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_ELEM_O_, __VA_ARGS__), (__VA_ARGS__))
+ #        define BOOST_PP_TUPLE_ELEM_I(m, args) BOOST_PP_TUPLE_ELEM_II(m, args)
+ #        define BOOST_PP_TUPLE_ELEM_II(m, args) BOOST_PP_CAT(m ## args,)
+--- foo/foo/foo/boost/preprocessor/tuple/rem.hpp
++++ foo/foo/foo/boost/preprocessor/tuple/rem.hpp
+@@ -105,7 +105,7 @@
+ # /* BOOST_PP_TUPLE_REM_CTOR */
+ #
+ # if BOOST_PP_VARIADICS
+-#    if BOOST_PP_VARIADICS_MSVC
++#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
+ #        define BOOST_PP_TUPLE_REM_CTOR(...) BOOST_PP_TUPLE_REM_CTOR_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_REM_CTOR_O_, __VA_ARGS__), (__VA_ARGS__))
+ #        define BOOST_PP_TUPLE_REM_CTOR_I(m, args) BOOST_PP_TUPLE_REM_CTOR_II(m, args)
+ #        define BOOST_PP_TUPLE_REM_CTOR_II(m, args) BOOST_PP_CAT(m ## args,)
+--- foo/foo/foo/boost/preprocessor/tuple/to_list.hpp
++++ foo/foo/foo/boost/preprocessor/tuple/to_list.hpp
+@@ -23,7 +23,7 @@
+ # /* BOOST_PP_TUPLE_TO_LIST */
+ #
+ # if BOOST_PP_VARIADICS
+-#    if BOOST_PP_VARIADICS_MSVC
++#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
+ #        define BOOST_PP_TUPLE_TO_LIST(...) BOOST_PP_TUPLE_TO_LIST_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_TO_LIST_O_, __VA_ARGS__), (__VA_ARGS__))
+ #        define BOOST_PP_TUPLE_TO_LIST_I(m, args) BOOST_PP_TUPLE_TO_LIST_II(m, args)
+ #        define BOOST_PP_TUPLE_TO_LIST_II(m, args) BOOST_PP_CAT(m ## args,)
+--- foo/foo/foo/boost/preprocessor/variadic/elem.hpp
++++ foo/foo/foo/boost/preprocessor/variadic/elem.hpp
+@@ -19,7 +19,7 @@
+ # /* BOOST_PP_VARIADIC_ELEM */
+ #
+ # if BOOST_PP_VARIADICS
+-#    if BOOST_PP_VARIADICS_MSVC
++#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
+ #        define BOOST_PP_VARIADIC_ELEM(n, ...) BOOST_PP_VARIADIC_ELEM_I(n,__VA_ARGS__)
+ #        define BOOST_PP_VARIADIC_ELEM_I(n, ...) BOOST_PP_CAT(BOOST_PP_CAT(BOOST_PP_VARIADIC_ELEM_, n)(__VA_ARGS__,),)
+ #    else
+--- foo/foo/foo/boost/preprocessor/variadic/size.hpp
++++ foo/foo/foo/boost/preprocessor/variadic/size.hpp
+@@ -19,7 +19,7 @@
+ # /* BOOST_PP_VARIADIC_SIZE */
+ #
+ # if BOOST_PP_VARIADICS
+-#    if BOOST_PP_VARIADICS_MSVC
++#    if defined(BOOST_PP_VARIADICS_MSVC) && BOOST_PP_VARIADICS_MSVC
+ #        define BOOST_PP_VARIADIC_SIZE(...) BOOST_PP_CAT(BOOST_PP_VARIADIC_SIZE_I(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,),)
+ #    else
+ #        define BOOST_PP_VARIADIC_SIZE(...) BOOST_PP_VARIADIC_SIZE_I(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,)

boost/boost.wundef.patch.1

---- a/boost/multi_array/base.hpp	2013-04-01 13:53:59.565375431 +0200
-+++ b/boost/multi_array/base.hpp	2013-04-01 13:54:03.230375652 +0200
-@@ -65,7 +65,7 @@
- // object creation in small-memory environments.  Thus, the objects
- // can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS 
- // before loading multi_array.hpp.
--#if !BOOST_MULTI_ARRAY_NO_GENERATORS
-+#ifndef BOOST_MULTI_ARRAY_NO_GENERATORS
- namespace {
-   multi_array_types::extent_gen extents;
-   multi_array_types::index_gen indices;
---- a/boost/interprocess/detail/workaround.hpp
-+++ a/boost/interprocess/detail/workaround.hpp
-@@ -29,19 +29,19 @@
- 
-    #include <unistd.h>
- 
--   #if ((_POSIX_THREAD_PROCESS_SHARED - 0) > 0)
-+   #if defined(_POSIX_THREAD_PROCESS_SHARED) && ((_POSIX_THREAD_PROCESS_SHARED - 0) > 0)
-    //Cygwin defines _POSIX_THREAD_PROCESS_SHARED but does not implement it.
-    //Mac Os X >= Leopard defines _POSIX_THREAD_PROCESS_SHARED but does not seems to work.
-    #  if !defined(__CYGWIN__) && !defined(__APPLE__)
-    #  define BOOST_INTERPROCESS_POSIX_PROCESS_SHARED
-    #  endif
-    #endif
-    
--   #if ((_POSIX_BARRIERS - 0) > 0)
-+   #if defined(_POSIX_BARRIERS) && ((_POSIX_BARRIERS - 0) > 0)
-    # define BOOST_INTERPROCESS_POSIX_BARRIERS
-    # endif
- 
--   #if ((_POSIX_SEMAPHORES - 0) > 0)
-+   #if defined(_POSIX_SEMAPHORES) && ((_POSIX_SEMAPHORES - 0) > 0)
-    # define BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
-    #  if defined(__CYGWIN__)
-       #define BOOST_INTERPROCESS_POSIX_SEMAPHORES_NO_UNLINK
-@@ -67,7 +67,7 @@
-    # define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
-    #endif
- 
--   #if ((_POSIX_SHARED_MEMORY_OBJECTS - 0) > 0)
-+   #if defined(_POSIX_SHARED_MEMORY_OBJECTS) && ((_POSIX_SHARED_MEMORY_OBJECTS - 0) > 0)
-    # define BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
-    #else
-    //VMS and MACOS don't define it but the have shm_open/close interface
-@@ -88,7 +88,7 @@
-    //#  define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS_ONLY
-    #endif
- 
--   #if ((_POSIX_TIMEOUTS - 0) > 0)
-+   #if defined(_POSIX_TIMEOUTS) && ((_POSIX_TIMEOUTS - 0) > 0)
-    # define BOOST_INTERPROCESS_POSIX_TIMEOUTS
-    #endif 
- 

boost/boost_1_44_0-clang-warnings.patch

---- misc/boost_1_44_0/boost/algorithm/string/detail/find_format_store.hpp	2010-07-10 22:29:03.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/algorithm/string/detail/find_format_store.hpp	2012-06-06 23:13:26.000000000 +0200
-@@ -71,7 +71,7 @@
-             };
+--- misc/boost_1_44_0/boost/math/tools/fraction.hpp
++++ misc/build/boost_1_44_0/boost/math/tools/fraction.hpp
+@@ -33,7 +33,7 @@
+        typedef typename Gen::result_type result_type;
+        typedef typename Gen::result_type value_type;
  
-             template<typename InputT, typename FindResultT>
--            bool check_find_result(InputT& Input, FindResultT& FindResult)
-+            bool check_find_result(InputT&, FindResultT& FindResult)
-             {
-                 typedef BOOST_STRING_TYPENAME 
-                     range_const_iterator<InputT>::type input_iterator_type; 
---- misc/boost_1_44_0/boost/concept_check.hpp
-+++ misc/build/boost_1_44_0/boost/concept_check.hpp
-@@ -136,7 +136,18 @@ namespace boost
-   {
-     BOOST_CONCEPT_USAGE(Assignable) {
- #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
-+#if defined __clang__
-+#if __has_warning("-Wself-assign-field")
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wself-assign-field"
-+#endif
-+#endif
-       a = a;             // require assignment operator
-+#if defined __clang__
-+#if __has_warning("-Wself-assign-field")
-+#pragma clang diagnostic pop
-+#endif
-+#endif
- #endif
-       const_constraints(a);
-     }
---- misc/boost_1_44_0/boost/date_time/dst_rules.hpp	2008-02-27 21:00:24.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/date_time/dst_rules.hpp	2012-06-06 23:11:03.000000000 +0200
-@@ -371,7 +371,7 @@
-         return is_not_in_dst;
-       }
- 
--      static bool is_dst_boundary_day(date_type d)
-+      static bool is_dst_boundary_day(date_type)
-       {
-         return false;
-       }
---- misc/boost_1_44_0/boost/date_time/gregorian_calendar.ipp	2010-01-10 20:17:23.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/date_time/gregorian_calendar.ipp	2012-06-06 22:27:07.000000000 +0200
-@@ -47,7 +47,7 @@
-       return week;
-     }
- 
--    if ((week == 53)) {
-+    if (week == 53) {
-       if((day==6) ||(day == 5 && is_leap_year(ymd.year))) {
-         return week; //under these circumstances week == 53.
-       } else {
---- misc/boost_1_44_0/boost/date_time/period_formatter.hpp	2008-02-27 21:00:24.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/date_time/period_formatter.hpp	2012-06-06 23:12:48.000000000 +0200
-@@ -114,10 +114,10 @@
-     {
-       m_range_option = option;
-     }
--    void delimiter_strings(const string_type& separator,
--                           const string_type& start_delim,
--                           const string_type& open_end_delim,
--                           const string_type& closed_end_delim)
-+    void delimiter_strings(const string_type&,
-+                           const string_type&,
-+                           const string_type&,
-+                           const string_type&)
-     {
-       m_period_separator;
-       m_period_start_delimeter;
+-       static result_type a(const value_type& v)
++       static result_type a(const value_type&)
+        {
+           return 1;
+        }
 --- misc/boost_1_44_0/boost/token_functions.hpp	2010-06-12 14:06:28.000000000 +0200
 +++ misc/build/boost_1_44_0/boost/token_functions.hpp	2012-06-06 23:12:27.000000000 +0200
 @@ -285,7 +285,7 @@
@@ -90,8 +30,8 @@
 +#pragma GCC system_header
 +#endif
 +
- #include <boost/config/no_tr1/cmath.hpp>
- #include <iostream>
+ #include <istream>
+ #include <iosfwd>
  #include <algorithm>     // std::max
 --- misc/boost_1_44_0/boost/random/shuffle_output.hpp
 +++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp
@@ -103,9 +43,9 @@
 +#pragma GCC system_header
 +#endif
 +
- #include <iostream>
- #include <algorithm>     // std::copy
- #include <cassert>
+ #include <boost/random/shuffle_order.hpp>
+ 
+ namespace boost {
 --- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
 +++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp
 @@ -16,6 +16,10 @@
@@ -116,34 +56,26 @@
 +#pragma GCC system_header
 +#endif
 +
- #include <boost/config/no_tr1/cmath.hpp>
+ #include <boost/config/no_tr1/cmath.hpp>         // std::pow
  #include <iostream>
  #include <algorithm>     // std::equal
---- misc/boost_1_44_0/boost/uuid/name_generator.hpp
-+++ misc/build/boost_1_44_0/boost/uuid/name_generator.hpp
-@@ -72,10 +72,10 @@
- 
-         for (size_t i=0; i<count; i++) {
-             uint32_t c = characters[i];
--            sha.process_byte( (c >> 0) && 0xFF );
--            sha.process_byte( (c >> 8) && 0xFF );
--            sha.process_byte( (c >> 16) && 0xFF );
--            sha.process_byte( (c >> 24) && 0xFF );
-+            sha.process_byte( (c >> 0) & 0xFF );
-+            sha.process_byte( (c >> 8) & 0xFF );
-+            sha.process_byte( (c >> 16) & 0xFF );
-+            sha.process_byte( (c >> 24) & 0xFF );
-         }
-     }
-     
---- misc/boost_1_44_0/boost/random/discard_block.hpp
-+++ misc/build/boost_1_44_0/boost/random/discard_block.hpp
-@@ -76,7 +76,7 @@
- 
-   result_type min BOOST_PREVENT_MACRO_SUBSTITUTION () const { return (_rng.min)(); }
-   result_type max BOOST_PREVENT_MACRO_SUBSTITUTION () const { return (_rng.max)(); }
--  static bool validation(result_type x) { return true; }  // dummy
-+  static bool validation(result_type) { return true; }  // dummy
- 
- #ifndef BOOST_NO_OPERATORS_IN_NAMESPACE
- 
+--- misc/boost_1_44_0/boost/smart_ptr/detail/make_array_helper.hpp
++++ misc/build/boost_1_44_0/boost/smart_ptr/detail/make_array_helper.hpp
+@@ -72,7 +72,7 @@
+                 memory->~Y();
+             }
+             template<typename U>
+-            bool operator==(const make_array_helper<T[], U>& other) const {
++            bool operator==(const make_array_helper<T[], U>&) const {
+                 return true;
+             }
+             template<typename U>
+@@ -138,7 +138,7 @@
+                 memory->~Y();
+             }
+             template<typename U>
+-            bool operator==(const make_array_helper<T[N], U>& other) const {
++            bool operator==(const make_array_helper<T[N], U>&) const {
+                 return true;
+             }
+             template<typename U>

boost/boost_1_44_0-gcc4.7.patch

---- misc/boost_1_44_0/boost/smart_ptr/shared_ptr.hpp	2009-12-14 18:44:19.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/smart_ptr/shared_ptr.hpp	2012-03-28 08:32:46.772493003 +0200
-@@ -207,7 +207,17 @@
-         boost::detail::sp_enable_shared_from_this( this, p, p );
-     }
- 
--//  generated copy constructor, destructor are fine
-+//  generated copy constructor, destructor are fine...
-+
-+#if defined( BOOST_HAS_RVALUE_REFS )
-+
-+// ... except in C++0x, move disables the implicit copy
-+
-+    shared_ptr( shared_ptr const & r ): px( r.px ), pn( r.pn ) // never throws
-+    {
-+    }
-+
-+#endif
- 
-     template<class Y>
-     explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw
---- misc/boost_1_44_0/boost/smart_ptr/weak_ptr.hpp	2009-12-14 18:44:19.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/smart_ptr/weak_ptr.hpp	2012-03-28 10:31:57.607462325 +0200
-@@ -40,8 +40,24 @@
-     {
-     }
- 
--//  generated copy constructor, assignment, destructor are fine
-+//  generated copy constructor, assignment, destructor are fine...
- 
-+#if defined( BOOST_HAS_RVALUE_REFS )
-+
-+// ... except in C++0x, move disables the implicit copy
-+
-+    weak_ptr( weak_ptr const & r ): px( r.px ), pn( r.pn ) // never throws
-+    {
-+    }
-+
-+    weak_ptr & operator=( weak_ptr const & r ) // never throws
-+    {
-+        px = r.px;
-+        pn = r.pn;
-+        return *this;
-+    }
-+
-+#endif
- 
- //
- //  The "obvious" converting constructor implementation:

boost/boost_1_44_0-gthreads.patch

---- misc/boost_1_44_0/boost/config/stdlib/libstdcpp3.hpp	2010-06-11 13:16:34.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/config/stdlib/libstdcpp3.hpp	2012-07-13 10:31:58.330127342 +0200
-@@ -31,7 +31,8 @@
- 
- #ifdef __GLIBCXX__ // gcc 3.4 and greater:
- #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
--        || defined(_GLIBCXX__PTHREADS)
-+        || defined(_GLIBCXX__PTHREADS) \
-+        || defined(_GLIBCXX_HAS_GTHREADS)
-       //
-       // If the std lib has thread support turned on, then turn it on in Boost
-       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT

boost/boost_1_44_0-logical-op-parentheses.patch

---- misc/boost_1_44_0/boost/spirit/home/classic/core/composite/directives.hpp
-+++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/composite/directives.hpp
-@@ -364,7 +364,7 @@
- 
-             if (l || r)
-             {
--                if (l.length() < r.length() && l || !r)
-+                if ((l.length() < r.length() && l) || !r)
-                 {
-                     scan.first = save;
-                     return l;
-

boost/boost_1_44_0-unused-parameters.patch

@@ -409,14 +409,14 @@
  
  template<class T>
  inline
--bool operator == ( none_t x, optional<T> const& y )
-+bool operator == ( __attribute__ ((unused)) none_t x, optional<T> const& y )
+-bool operator == ( none_t , optional<T> const& y )
++bool operator == ( __attribute__ ((unused)) none_t , optional<T> const& y )
  { return equal_pointees(optional<T>() ,y); }
  
  template<class T>
  inline
--bool operator < ( none_t x, optional<T> const& y )
-+bool operator < ( __attribute__ ((unused)) none_t x, optional<T> const& y )
+-bool operator < ( none_t , optional<T> const& y )
++bool operator < ( __attribute__ ((unused)) none_t , optional<T> const& y )
  { return less_pointees(optional<T>() ,y); }
  
  template<class T>
@@ -726,37 +726,6 @@
  
  template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const & e )
  {
---- misc/boost_1_44_0/boost/unordered/detail/node.hpp	2009-09-24 23:12:46.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/unordered/detail/node.hpp	2012-01-20 12:44:07.128316328 +0100
-@@ -35,7 +35,7 @@
-     }
- 
-     template <class A>
--    inline std::size_t ungrouped_node_base<A>::group_count(node_ptr)
-+    inline std::size_t ungrouped_node_base<A>::group_count(__attribute__ ((unused)) node_ptr)
-     {
-         return 1;
-     }
---- misc/boost_1_44_0/boost/unordered/detail/util.hpp	2010-02-25 20:05:01.000000000 +0100
-+++ misc/build/boost_1_44_0/boost/unordered/detail/util.hpp	2012-01-20 12:44:07.128316328 +0100
-@@ -149,7 +149,7 @@
- #if defined(BOOST_UNORDERED_STD_FORWARD)
- 
-     template <class T, class... Args>
--    inline void construct_impl(T*, void* address, Args&&... args)
-+    inline void construct_impl(__attribute__ ((unused)) T*, void* address, Args&&... args)
-     {
-         new(address) T(std::forward<Args>(args)...);
-     }
-@@ -262,7 +262,7 @@
- 
- #endif
-         template <class K, class M>
--        void construct_pair(K const& k, M*)
-+        void construct_pair(K const& k, __attribute__ ((unused)) M*)
-         {
-             construct_preamble();
-             new(node_->address()) value_type(k, M());                    
 --- misc/boost_1_44_0/boost/utility/addressof.hpp	2009-05-16 20:15:17.000000000 +0200
 +++ misc/build/boost_1_44_0/boost/utility/addressof.hpp	2012-01-20 12:44:07.128316328 +0100
 @@ -34,7 +34,7 @@
@@ -862,8 +831,8 @@
      }
  
      template <typename U>
--    bool operator()(U&)
-+    bool operator()(__attribute__ ((unused)) U&)
+-    bool operator()(U&) BOOST_NOEXCEPT
++    bool operator()(__attribute__ ((unused)) U&) BOOST_NOEXCEPT
      {
          return false;
      }
@@ -921,44 +890,6 @@
          {
              typedef typename has_nothrow_copy<RhsT>::type
                  nothrow_copy;
---- misc/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp	2012-01-20 15:24:32.362576125 +0100
-+++ misc/build/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp	2012-01-20 12:44:07.130316320 +0100
-@@ -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(__attribute__ ((unused)) 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, __attribute__ ((unused)) 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(__attribute__ ((unused)) 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, __attribute__ ((unused)) 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/ptr_container/detail/default_deleter.hpp
 +++ misc/build/boost_1_44_0/boost/ptr_container/detail/default_deleter.hpp
 @@ -61,7 +61,7 @@

download.lst

@@ -12,7 +12,7 @@ export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-
 export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
 export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-export BOOST_TARBALL := f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+export BOOST_TARBALL := a00d22605d5dbcfb4c9936a9b35bc4c2-boost_1_53_0.tar.bz2
 export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz

liborcus/ExternalProject_liborcus.mk

@@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
 
 $(eval $(call gb_ExternalProject_use_externals,liborcus, \
     boost_headers \
+	boostsystem \
     zlib \
 ))
 
@@ -36,6 +37,8 @@ liborcus_LIBS+=-lz
 endif
 ifeq ($(SYSTEM_BOOST),YES)
 liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
+else
+liborcus_LIBS+=$(SOLARLIB) -lboostsystem
 endif
 ifeq ($(OS),ANDROID)
 liborcus_LIBS+=-lgnustl_shared -lm

sc/Library_scfilt.mk

@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\
 
 $(eval $(call gb_Library_use_externals,scfilt,\
 	boost_headers \
+	boostsystem \
 	mdds_headers \
 ))