Bump boost to 1.59 final release

Change-Id: Id71e098dd2356043d2b5fee0736ebfedb5c8c1cd
Reviewed-on: https://gerrit.libreoffice.org/18050
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>

10 files changed, 97 insertions, 204 deletions

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 732b5645f059..54899c4f4a3b 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -70,8 +70,6 @@ boost_patches += rtti.patch.0
 
 # https://svn.boost.org/trac/boost/ticket/11505
 boost_patches += boost_1_59_0.mpl.config.wundef.patch
-# https://svn.boost.org/trac/boost/ticket/11503
-boost_patches += boost_1_59_0.type_index.wshadow.patch
 # https://svn.boost.org/trac/boost/ticket/11502
 boost_patches += boost_1_59_0.property_tree.wtype-limits.patch
 # https://svn.boost.org/trac/boost/ticket/11507
@@ -82,19 +80,12 @@ boost_patches += boost_1_59_0.iostreams.wshadow.patch
 boost_patches += boost_1_59_0.iostreams.wunused.patch
 # https://svn.boost.org/trac/boost/ticket/11506
 boost_patches += boost_1_59_0.rational.wshadow.patch
-# https://svn.boost.org/trac/boost/ticket/11510
-boost_patches += boost_1_59_0.unique_ptr.wshadow.patch
-# fixed upstream
-# https://svn.boost.org/trac/boost/ticket/11500
-boost_patches += boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch
 # https://svn.boost.org/trac/boost/ticket/11511
 boost_patches += boost_1_59_0.multi_array.wshadow.patch
-# https://svn.boost.org/trac/boost/ticket/11512
-boost_patches += boost_1_59_0.signal2.wshadow.patch
 # https://svn.boost.org/trac/boost/ticket/11501
 boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
-# fixed upstream by bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4
-boost_patches += boost.concept_check.Wunused-local-typedefs.warnings.patch.1
+# https://svn.boost.org/trac/boost/ticket/11597
+boost_patches += boost_1_59_0.system.no.deprecated.patch
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
diff --git a/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 b/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1
deleted file mode 100644
index c85fc7e26143..000000000000
--- a/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixed differently upstream by commit bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4
-
---- boost/boost/concept/detail/general.hpp.orig	2015-07-31 14:03:08.184447736 +0200
-+++ boost/boost/concept/detail/general.hpp	2015-07-31 14:03:10.048447591 +0200
-@@ -67,7 +67,7 @@
- 
- // Version check from https://svn.boost.org/trac/boost/changeset/82886
- // (boost/static_assert.hpp)
--#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) 
-+#if defined(__GNUC__) && (((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) || defined(__clang__))
- #define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused))
- #else
- #define BOOST_CONCEPT_UNUSED_TYPEDEF /**/
diff --git a/external/boost/boost.preprocessor.Wundef.warnings.patch b/external/boost/boost.preprocessor.Wundef.warnings.patch
index 1dc9888379d6..26d28454b4e5 100644
--- a/external/boost/boost.preprocessor.Wundef.warnings.patch
+++ b/external/boost/boost.preprocessor.Wundef.warnings.patch
@@ -1,15 +1,3 @@
-diff -ur boost.orig/boost/preprocessor/config/config.hpp boost/boost/preprocessor/config/config.hpp
---- foo/misc/boost.orig/boost/preprocessor/config/config.hpp	2015-03-28 09:19:20.000000000 +0100
-+++ foo/misc/boost/boost/preprocessor/config/config.hpp	2015-07-16 07:47:54.969987660 +0200
-@@ -79,7 +79,7 @@
- #        define BOOST_PP_VARIADICS 1
- #        define BOOST_PP_VARIADICS_MSVC 1
- #    /* Wave (C/C++), GCC (C++) */
--#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && __GXX_EXPERIMENTAL_CXX0X__
-+#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__
- #        define BOOST_PP_VARIADICS 1
- #    /* EDG-based (C/C++), GCC (C), and unknown (C/C++) */
- #    elif !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L
 diff -ur boost.orig/boost/preprocessor/tuple/detail/is_single_return.hpp boost/boost/preprocessor/tuple/detail/is_single_return.hpp
 --- foo/misc/boost.orig/boost/preprocessor/tuple/detail/is_single_return.hpp	2015-03-28 09:19:20.000000000 +0100
 +++ foo/misc/boost/boost/preprocessor/tuple/detail/is_single_return.hpp	2015-07-16 07:57:29.881981198 +0200
diff --git a/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch b/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch
index 55510805a886..78a4cb07b931 100644
--- a/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch
+++ b/external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch
@@ -15,17 +15,6 @@ diff -ru boost.orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
          for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
              (*i)->undefine(self);
  # else
-diff -ru boost.orig/boost/spirit/home/classic/core/primitives/primitives.hpp boost/boost/spirit/home/classic/core/primitives/primitives.hpp
---- foo/misc/boost.orig/boost/spirit/home/classic/core/primitives/primitives.hpp	2015-07-18 21:46:45.775978491 +0200
-+++ foo/misc/boost/boost/spirit/home/classic/core/primitives/primitives.hpp	2015-07-18 22:03:35.695967140 +0200
-@@ -47,7 +47,6 @@
-         typename parser_result<self_t, ScannerT>::type
-         parse(ScannerT const& scan) const
-         {
--            typedef typename parser_result<self_t, ScannerT>::type result_t;
-             typedef typename ScannerT::value_t value_t;
-             typedef typename ScannerT::iterator_t iterator_t;
- 
 diff -ru boost.orig/boost/spirit/home/classic/error_handling/exceptions.hpp boost/boost/spirit/home/classic/error_handling/exceptions.hpp
 --- foo/misc/boost.orig/boost/spirit/home/classic/error_handling/exceptions.hpp	2015-07-18 21:46:45.768978491 +0200
 +++ foo/misc/boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2015-07-18 22:00:33.396969189 +0200
diff --git a/external/boost/boost_1_44_0-unused-parameters.patch b/external/boost/boost_1_44_0-unused-parameters.patch
index d3341bfee128..174513ba1146 100644
--- a/external/boost/boost_1_44_0-unused-parameters.patch
+++ b/external/boost/boost_1_44_0-unused-parameters.patch
@@ -671,44 +671,44 @@ diff -ru boost.orig/boost/foreach.hpp boost/boost/foreach.hpp
      typedef BOOST_DEDUCED_TYPENAME type2type<T, C>::type type;
      typedef BOOST_DEDUCED_TYPENAME foreach_reverse_iterator<T, C>::type iterator;
 diff -ru boost.orig/boost/function/function_template.hpp boost/boost/function/function_template.hpp
---- foo/misc/boost.orig/boost/function/function_template.hpp	2015-01-18 18:32:44.000000000 +0100
-+++ foo/misc/boost/boost/function/function_template.hpp	2015-07-16 22:03:43.157979869 +0200
+--- foo/misc/boost.orig/boost/function/function_template.hpp	2015-07-22 19:33:01.000000000 +0200
++++ foo/misc/boost/boost/function/function_template.hpp	2015-08-27 10:14:49.023960640 +0200
 @@ -717,7 +717,7 @@
      template<typename Functor>
      BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
  #ifndef BOOST_NO_SFINAE
--                            ,typename enable_if_c<
-+                            ,__attribute__ ((unused)) typename enable_if_c<
-                             (boost::type_traits::ice_not<
-                              (is_integral<Functor>::value)>::value),
+-                            ,typename boost::enable_if_c<
++                            ,__attribute__ ((unused)) typename boost::enable_if_c<
+                              !(is_integral<Functor>::value),
                                          int>::type = 0
-@@ -730,7 +730,7 @@
+ #endif // BOOST_NO_SFINAE
+@@ -729,7 +729,7 @@
      template<typename Functor,typename Allocator>
      BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a
  #ifndef BOOST_NO_SFINAE
--                            ,typename enable_if_c<
-+                            ,__attribute__ ((unused)) typename enable_if_c<
-                             (boost::type_traits::ice_not<
-                              (is_integral<Functor>::value)>::value),
+-                            ,typename boost::enable_if_c<
++                            ,__attribute__ ((unused)) typename boost::enable_if_c<
+                               !(is_integral<Functor>::value),
                                          int>::type = 0
-@@ -1068,7 +1068,7 @@
+ #endif // BOOST_NO_SFINAE
+@@ -1065,7 +1065,7 @@
    template<typename Functor>
    function(Functor f
  #ifndef BOOST_NO_SFINAE
--           ,typename enable_if_c<
-+           ,__attribute__ ((unused)) typename enable_if_c<
-                             (boost::type_traits::ice_not<
-                           (is_integral<Functor>::value)>::value),
+-           ,typename boost::enable_if_c<
++           ,__attribute__ ((unused)) typename boost::enable_if_c<
+                           !(is_integral<Functor>::value),
                         int>::type = 0
-@@ -1080,7 +1080,7 @@
+ #endif
+@@ -1076,7 +1076,7 @@
    template<typename Functor,typename Allocator>
    function(Functor f, Allocator a
  #ifndef BOOST_NO_SFINAE
--           ,typename enable_if_c<
-+           ,__attribute__ ((unused)) typename enable_if_c<
-                             (boost::type_traits::ice_not<
-                           (is_integral<Functor>::value)>::value),
+-           ,typename boost::enable_if_c<
++           ,__attribute__ ((unused)) typename boost::enable_if_c<
+                            !(is_integral<Functor>::value),
                         int>::type = 0
+ #endif
 diff -ru boost.orig/boost/iterator/reverse_iterator.hpp boost/boost/iterator/reverse_iterator.hpp
 --- foo/misc/boost.orig/boost/iterator/reverse_iterator.hpp	2014-09-06 19:18:28.000000000 +0200
 +++ foo/misc/boost/boost/iterator/reverse_iterator.hpp	2015-07-16 22:04:18.012979478 +0200
diff --git a/external/boost/boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch b/external/boost/boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch
deleted file mode 100644
index 4974127c4868..000000000000
--- a/external/boost/boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch is needed to avoid type collision between Bool type
-defined in XLib with non used non class template parameter
-name introduced in this commit in move library:
-
-  4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.
-
-The obscure error message was issued on both Clang 3.8 and GCC 4.8.1:
-
-   In file included from /home/davido/projects/libo/include/prex.h:32:0,
-                 from /home/davido/projects/libo/include/vcl/opengl/OpenGLHelper.hxx:20,
-                 from /home/davido/projects/libo/vcl/source/opengl/OpenGLHelper.cxx:11:
-/home/davido/projects/libo/workdir/UnpackedTarball/boost/boost/move/detail/meta_utils.hpp:350:15: error: two or more data types in declaration of ‘parameter’
- template<bool Bool, class B = true_, class C = true_, class D = true_>
-               ^
-In file included from /home/davido/projects/libo/workdir/UnpackedTarball/boost/boost/move/utility_core.hpp:30:0,
-                 from /home/davido/projects/libo/workdir/UnpackedTarball/boost/boost/move/utility.hpp:28,
-                 from /home/davido/projects/libo/workdir/UnpackedTarball/boost/boost/optional/optional.hpp:50,
-                 from /home/davido/projects/libo/workdir/UnpackedTarball/boost/boost/optional.hpp:15,
-                 from /home/davido/projects/libo/workdir/CustomTarget/officecfg/registry/officecfg/Office/Common.hxx:7,
-                 from /home/davido/projects/libo/vcl/source/opengl/OpenGLHelper.cxx:22:
-/home/davido/projects/libo/workdir/UnpackedTarball/boost/boost/move/detail/meta_utils.hpp:352:29: note: invalid template non-type parameter
-    : and_impl<B::value, C, D>
-
-diff -ru boost.orig/boost/move/detail/meta_utils.hpp boost/boost/move/detail/meta_utils.hpp
---- foo/misc/boost.orig/boost/move/detail/meta_utils.hpp	2015-07-19 14:16:13.764836630 +0200
-+++ foo/misc/boost/boost/move/detail/meta_utils.hpp	2015-07-19 21:04:15.960985030 +0200
-@@ -347,7 +347,7 @@
- //                         and_
- //
- //////////////////////////////////////////////////////////////////////////////
--template<bool Bool, class B = true_, class C = true_, class D = true_>
-+template<bool, class B = true_, class C = true_, class D = true_>
- struct and_impl
-    : and_impl<B::value, C, D>
- {};
-@@ -374,7 +374,7 @@
- //                            or_
- //
- //////////////////////////////////////////////////////////////////////////////
--template<bool Bool, class B = false_, class C = false_, class D = false_>
-+template<bool, class B = false_, class C = false_, class D = false_>
- struct or_impl
-    : or_impl<B::value, C, D>
- {};
diff --git a/external/boost/boost_1_59_0.signal2.wshadow.patch b/external/boost/boost_1_59_0.signal2.wshadow.patch
deleted file mode 100644
index 1c13e940ebf3..000000000000
--- a/external/boost/boost_1_59_0.signal2.wshadow.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ru boost.orig/boost/signals2/connection.hpp boost/boost/signals2/connection.hpp
---- foo/misc/boost.orig/boost/signals2/connection.hpp	2015-07-09 20:06:58.000000000 +0200
-+++ foo/misc/boost/boost/signals2/connection.hpp	2015-07-19 21:54:54.491994554 +0200
-@@ -68,12 +68,12 @@
-           nolock_disconnect(local_lock);
-         }
-         template<typename Mutex>
--        void nolock_disconnect(garbage_collecting_lock<Mutex> &lock) const
-+        void nolock_disconnect(garbage_collecting_lock<Mutex> &lock_) const
-         {
-           if(_connected)
-           {
-             _connected = false;
--            dec_slot_refcount(lock);
-+            dec_slot_refcount(lock_);
-           }
-         }
-         virtual bool connected() const = 0;
-@@ -118,12 +118,12 @@
-         // shared_ptr to the slot in the garbage collecting lock,
-         // which will destroy the slot only after it unlocks.
-         template<typename Mutex>
--        void dec_slot_refcount(garbage_collecting_lock<Mutex> &lock) const
-+        void dec_slot_refcount(garbage_collecting_lock<Mutex> &lock_arg) const
-         {
-           BOOST_ASSERT(m_slot_refcount != 0);
-           if(--m_slot_refcount == 0)
-           {
--            lock.add_trash(release_slot());
-+            lock_arg.add_trash(release_slot());
-           }
-         }
- 
-@@ -155,17 +155,17 @@
-         const GroupKey& group_key() const {return _group_key;}
-         void set_group_key(const GroupKey &key) {_group_key = key;}
-         template<typename M>
--        void disconnect_expired_slot(garbage_collecting_lock<M> &lock)
-+        void disconnect_expired_slot(garbage_collecting_lock<M> &lock_arg)
-         {
-           if(!m_slot) return;
-           bool expired = slot().expired();
-           if(expired == true)
-           {
--            nolock_disconnect(lock);
-+            nolock_disconnect(lock_arg);
-           }
-         }
-         template<typename M, typename OutputIterator>
--        void nolock_grab_tracked_objects(garbage_collecting_lock<M> &lock,
-+        void nolock_grab_tracked_objects(garbage_collecting_lock<M> &lock_arg,
-           OutputIterator inserter) const
-         {
-           if(!m_slot) return;
-@@ -184,7 +184,7 @@
-             );
-             if(apply_visitor(detail::expired_weak_ptr_visitor(), *it))
-             {
--              nolock_disconnect(lock);
-+              nolock_disconnect(lock_arg);
-               return;
-             }
-             *inserter++ = locked_object;
diff --git a/external/boost/boost_1_59_0.system.no.deprecated.patch b/external/boost/boost_1_59_0.system.no.deprecated.patch
new file mode 100644
index 000000000000..867811f6879a
--- /dev/null
+++ b/external/boost/boost_1_59_0.system.no.deprecated.patch
@@ -0,0 +1,74 @@
+Starting from 1.59.0 final release, there are undefined generic_category()
+errors in internal and external modules: [1].
+
+Instead of defining the -DBOOST_SYSTEM_NO_DEPRECATED in internal and external
+modules, patch the boost to not define the deprecated stuff per default.
+
+[1] http://paste.openstack.org/show/430509
+
+diff -ru boost.orig/boost/system/detail/error_code.ipp boost/boost/system/detail/error_code.ipp
+--- foo/misc/boost.orig/boost/system/detail/error_code.ipp	2015-01-06 17:08:27.000000000 +0100
++++ foo/misc/boost/boost/system/detail/error_code.ipp	2015-08-28 21:47:00.941340365 +0200
+@@ -437,7 +437,7 @@
+ } // unnamed namespace
+ 
+ 
+-# ifndef BOOST_SYSTEM_NO_DEPRECATED
++# ifdef BOOST_SYSTEM_DEPRECATED
+     BOOST_SYSTEM_DECL error_code throws; // "throw on error" special error_code;
+                                          //  note that it doesn't matter if this
+                                          //  isn't initialized before use since
+diff -ru boost.orig/boost/system/error_code.hpp boost/boost/system/error_code.hpp
+--- foo/misc/boost.orig/boost/system/error_code.hpp	2015-01-06 17:08:27.000000000 +0100
++++ foo/misc/boost/boost/system/error_code.hpp	2015-08-28 21:47:58.318344217 +0200
+@@ -139,7 +139,7 @@
+ 
+     } // namespace errc
+ 
+-# ifndef BOOST_SYSTEM_NO_DEPRECATED
++# ifdef BOOST_SYSTEM_DEPRECATED
+     namespace posix = errc;
+     namespace posix_error = errc;
+ # endif
+@@ -214,7 +214,7 @@
+ #endif
+     //  deprecated synonyms --------------------------------------------------//
+ 
+-# ifndef BOOST_SYSTEM_NO_DEPRECATED
++# ifdef BOOST_SYSTEM_DEPRECATED
+     inline const error_category &  get_system_category() { return system_category(); }
+     inline const error_category &  get_generic_category() { return generic_category(); }
+     inline const error_category &  get_posix_category() { return generic_category(); }
+@@ -394,7 +394,7 @@
+     };
+ 
+     //  predefined error_code object used as "throw on error" tag
+-# ifndef BOOST_SYSTEM_NO_DEPRECATED
++# ifdef BOOST_SYSTEM_DEPRECATED
+     BOOST_SYSTEM_DECL extern error_code throws;
+ # endif
+ 
+diff -ru boost.orig/boost/system/linux_error.hpp boost/boost/system/linux_error.hpp
+--- foo/misc/boost.orig/boost/system/linux_error.hpp	2015-01-06 17:08:27.000000000 +0100
++++ foo/misc/boost/boost/system/linux_error.hpp	2015-08-28 21:47:17.172341455 +0200
+@@ -89,7 +89,7 @@
+       };
+     }  // namespace linux_error
+ 
+-# ifndef BOOST_SYSTEM_NO_DEPRECATED
++# ifdef BOOST_SYSTEM_DEPRECATED
+     namespace Linux = linux_error;
+ # endif
+ 
+diff -ru boost.orig/boost/system/windows_error.hpp boost/boost/system/windows_error.hpp
+--- foo/misc/boost.orig/boost/system/windows_error.hpp	2015-01-06 17:08:27.000000000 +0100
++++ foo/misc/boost/boost/system/windows_error.hpp	2015-08-28 21:46:39.802338946 +0200
+@@ -105,7 +105,7 @@
+ 
+     }  // namespace windows
+ 
+-# ifndef BOOST_SYSTEM_NO_DEPRECATED
++# ifdef BOOST_SYSTEM_DEPRECATED
+     namespace windows = windows_error;
+ # endif
+ 
diff --git a/external/boost/boost_1_59_0.type_index.wshadow.patch b/external/boost/boost_1_59_0.type_index.wshadow.patch
deleted file mode 100644
index e9be9403bebc..000000000000
--- a/external/boost/boost_1_59_0.type_index.wshadow.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru boost.orig/boost/type_index/type_index_facade.hpp boost/boost/type_index/type_index_facade.hpp
---- foo/misc/boost.orig/boost/type_index/type_index_facade.hpp	2015-07-19 11:39:38.476942225 +0200
-+++ foo/misc/boost/boost/type_index/type_index_facade.hpp	2015-07-19 11:41:13.032941163 +0200
-@@ -105,8 +105,8 @@
-     /// \return Hash code of a type. By default hashes types by raw_name().
-     /// \note <boost/functional/hash.hpp> has to be included if this function is used.
-     inline std::size_t hash_code() const BOOST_NOEXCEPT {
--        const char* const name = derived().raw_name();
--        return boost::hash_range(name, name + std::strlen(name));
-+        const char* const name_ = derived().raw_name();
-+        return boost::hash_range(name_, name_ + std::strlen(name_));
-     }
- 
- #if defined(BOOST_TYPE_INDEX_DOXYGEN_INVOKED)
-
diff --git a/external/boost/boost_1_59_0.unique_ptr.wshadow.patch b/external/boost/boost_1_59_0.unique_ptr.wshadow.patch
deleted file mode 100644
index 2121d0ded71a..000000000000
--- a/external/boost/boost_1_59_0.unique_ptr.wshadow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru boost.orig/boost/move/unique_ptr.hpp boost/boost/move/unique_ptr.hpp
---- foo/misc/boost.orig/boost/move/unique_ptr.hpp	2015-07-19 13:02:01.788886667 +0200
-+++ foo/misc/boost/boost/move/unique_ptr.hpp	2015-07-19 13:02:34.385886300 +0200
-@@ -105,8 +105,8 @@
-    {}
- 
-    template <class U>
--   unique_ptr_data(P p, BOOST_FWD_REF(U) d) BOOST_NOEXCEPT
--      : m_p(p), d(::boost::forward<U>(d))
-+   unique_ptr_data(P p, BOOST_FWD_REF(U) d_) BOOST_NOEXCEPT
-+      : m_p(p), d(::boost::forward<U>(d_))
-    {}
- 
-    del_ref deleter()       { return d; }