diff --git a/include/boost/smart_ptr/allocate_shared_array.hpp b/include/boost/smart_ptr/allocate_shared_array.hpp index 09e57be..ca6cc15 100644 --- a/include/boost/smart_ptr/allocate_shared_array.hpp +++ b/include/boost/smart_ptr/allocate_shared_array.hpp @@ -14,7 +14,6 @@ Distributed under the Boost Software License, Version 1.0. #include #include #include -#include #include #include @@ -23,7 +22,7 @@ namespace detail { template struct sp_array_element { - typedef typename boost::remove_cv::type>::type type; }; diff --git a/include/boost/smart_ptr/allocate_unique.hpp b/include/boost/smart_ptr/allocate_unique.hpp index 7005287..02d4d50 100644 --- a/include/boost/smart_ptr/allocate_unique.hpp +++ b/include/boost/smart_ptr/allocate_unique.hpp @@ -17,7 +17,6 @@ Distributed under the Boost Software License, Version 1.0. #include #include #include -#include #include #include #include @@ -55,7 +54,7 @@ struct sp_alloc_result { template struct sp_alloc_value { - typedef typename boost::remove_cv::type>::type type; }; @@ -69,7 +68,7 @@ public: #if defined(BOOST_MSVC) && BOOST_MSVC == 1600 sp_alloc_ptr(T* p) noexcept - : p_(const_cast::type*>(p)) { } + : p_(const_cast::type*>(p)) { } #endif sp_alloc_ptr(std::size_t, P p) noexcept @@ -106,7 +105,7 @@ public: static sp_alloc_ptr pointer_to(T& v) { return sp_alloc_ptr(1, std::pointer_traits

::pointer_to(const_cast::type&>(v))); + std::remove_cv::type&>(v))); } #endif @@ -153,7 +152,7 @@ public: static sp_alloc_ptr pointer_to(T& v) { return sp_alloc_ptr(n_, std::pointer_traits

::pointer_to(const_cast::type&>(v))); + std::remove_cv::type&>(v))); } #endif @@ -200,7 +199,7 @@ public: static sp_alloc_ptr pointer_to(T& v) { return sp_alloc_ptr(N, std::pointer_traits

::pointer_to(const_cast::type&>(v))); + std::remove_cv::type&>(v))); } #endif