forked from boostorg/core
Workaround for MSVC 2017 warning
MSVC provides deprecated members on allocator which we detect.
This commit is contained in:
@@ -10,6 +10,9 @@ Distributed under the Boost Software License, Version 1.0.
|
|||||||
|
|
||||||
#include <boost/core/pointer_traits.hpp>
|
#include <boost/core/pointer_traits.hpp>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
#if defined(BOOST_DINKUMWARE_STDLIB)
|
||||||
|
#include <memory>
|
||||||
|
#endif
|
||||||
#include <new>
|
#include <new>
|
||||||
#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
|
#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
@@ -243,6 +246,18 @@ struct alloc_if<true, R> {
|
|||||||
typedef R type;
|
typedef R type;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template<class>
|
||||||
|
struct alloc_enable {
|
||||||
|
BOOST_STATIC_CONSTEXPR bool value = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
#if defined(BOOST_DINKUMWARE_STDLIB)
|
||||||
|
template<class T>
|
||||||
|
struct alloc_enable<std::allocator<T> > {
|
||||||
|
BOOST_STATIC_CONSTEXPR bool value = false;
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
|
#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
|
||||||
template<class T>
|
template<class T>
|
||||||
T alloc_declval() BOOST_NOEXCEPT;
|
T alloc_declval() BOOST_NOEXCEPT;
|
||||||
@@ -266,8 +281,9 @@ struct alloc_has_allocate<A,
|
|||||||
} /* detail */
|
} /* detail */
|
||||||
|
|
||||||
template<class A>
|
template<class A>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_allocate<A>::value,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
typename allocator_pointer<A>::type>::type
|
detail::alloc_has_allocate<A>::value,
|
||||||
|
typename allocator_pointer<A>::type>::type
|
||||||
allocator_allocate(A& a, typename allocator_size_type<A>::type n,
|
allocator_allocate(A& a, typename allocator_size_type<A>::type n,
|
||||||
typename allocator_const_void_pointer<A>::type h)
|
typename allocator_const_void_pointer<A>::type h)
|
||||||
{
|
{
|
||||||
@@ -275,8 +291,9 @@ allocator_allocate(A& a, typename allocator_size_type<A>::type n,
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class A>
|
template<class A>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_allocate<A>::value,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
typename allocator_pointer<A>::type>::type
|
!detail::alloc_has_allocate<A>::value,
|
||||||
|
typename allocator_pointer<A>::type>::type
|
||||||
allocator_allocate(A& a, typename allocator_size_type<A>::type n,
|
allocator_allocate(A& a, typename allocator_size_type<A>::type n,
|
||||||
typename allocator_const_void_pointer<A>::type)
|
typename allocator_const_void_pointer<A>::type)
|
||||||
{
|
{
|
||||||
@@ -309,16 +326,16 @@ struct alloc_has_construct<A, T,
|
|||||||
} /* detail */
|
} /* detail */
|
||||||
|
|
||||||
template<class A, class T>
|
template<class A, class T>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_construct<A,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
T>::value>::type
|
detail::alloc_has_construct<A, T>::value>::type
|
||||||
allocator_construct(A& a, T* p)
|
allocator_construct(A& a, T* p)
|
||||||
{
|
{
|
||||||
a.construct(p);
|
a.construct(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T>
|
template<class A, class T>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_construct<A,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
T>::value>::type
|
!detail::alloc_has_construct<A, T>::value>::type
|
||||||
allocator_construct(A&, T* p)
|
allocator_construct(A&, T* p)
|
||||||
{
|
{
|
||||||
::new((void*)p) T();
|
::new((void*)p) T();
|
||||||
@@ -345,16 +362,16 @@ struct alloc_has_construct_args<decltype(alloc_declval<A
|
|||||||
} /* detail */
|
} /* detail */
|
||||||
|
|
||||||
template<class A, class T, class V, class... Args>
|
template<class A, class T, class V, class... Args>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_construct_args<void, A, T,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
V, Args...>::value>::type
|
detail::alloc_has_construct_args<void, A, T, V, Args...>::value>::type
|
||||||
allocator_construct(A& a, T* p, V&& v, Args&&... args)
|
allocator_construct(A& a, T* p, V&& v, Args&&... args)
|
||||||
{
|
{
|
||||||
a.construct(p, std::forward<V>(v), std::forward<Args>(args)...);
|
a.construct(p, std::forward<V>(v), std::forward<Args>(args)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T, class V, class... Args>
|
template<class A, class T, class V, class... Args>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_construct_args<void, A, T,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
V, Args...>::value>::type
|
!detail::alloc_has_construct_args<void, A, T, V, Args...>::value>::type
|
||||||
allocator_construct(A&, T* p, V&& v, Args&&... args)
|
allocator_construct(A&, T* p, V&& v, Args&&... args)
|
||||||
{
|
{
|
||||||
::new((void*)p) T(std::forward<V>(v), std::forward<Args>(args)...);
|
::new((void*)p) T(std::forward<V>(v), std::forward<Args>(args)...);
|
||||||
@@ -380,48 +397,48 @@ struct alloc_has_construct_arg<A, T, V,
|
|||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||||
template<class A, class T, class V>
|
template<class A, class T, class V>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_construct_arg<A, T,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
V&&>::value>::type
|
detail::alloc_has_construct_arg<A, T, V&&>::value>::type
|
||||||
allocator_construct(A& a, T* p, V&& v)
|
allocator_construct(A& a, T* p, V&& v)
|
||||||
{
|
{
|
||||||
a.construct(p, std::forward<V>(v));
|
a.construct(p, std::forward<V>(v));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T, class V>
|
template<class A, class T, class V>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_construct_arg<A, T,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
V&&>::value>::type
|
!detail::alloc_has_construct_arg<A, T, V&&>::value>::type
|
||||||
allocator_construct(A&, T* p, V&& v)
|
allocator_construct(A&, T* p, V&& v)
|
||||||
{
|
{
|
||||||
::new((void*)p) T(std::forward<V>(v));
|
::new((void*)p) T(std::forward<V>(v));
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
template<class A, class T, class V>
|
template<class A, class T, class V>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_construct_arg<A, T,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
const V&>::value>::type
|
detail::alloc_has_construct_arg<A, T, const V&>::value>::type
|
||||||
allocator_construct(A& a, T* p, const V& v)
|
allocator_construct(A& a, T* p, const V& v)
|
||||||
{
|
{
|
||||||
a.construct(p, v);
|
a.construct(p, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T, class V>
|
template<class A, class T, class V>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_construct_arg<A, T,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
const V&>::value>::type
|
!detail::alloc_has_construct_arg<A, T, const V&>::value>::type
|
||||||
allocator_construct(A&, T* p, const V& v)
|
allocator_construct(A&, T* p, const V& v)
|
||||||
{
|
{
|
||||||
::new((void*)p) T(v);
|
::new((void*)p) T(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T, class V>
|
template<class A, class T, class V>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_construct_arg<A, T,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
V&>::value>::type
|
detail::alloc_has_construct_arg<A, T, V&>::value>::type
|
||||||
allocator_construct(A& a, T* p, V& v)
|
allocator_construct(A& a, T* p, V& v)
|
||||||
{
|
{
|
||||||
a.construct(p, v);
|
a.construct(p, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T, class V>
|
template<class A, class T, class V>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_construct_arg<A, T,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
V&>::value>::type
|
!detail::alloc_has_construct_arg<A, T, V&>::value>::type
|
||||||
allocator_construct(A&, T* p, V& v)
|
allocator_construct(A&, T* p, V& v)
|
||||||
{
|
{
|
||||||
::new((void*)p) T(v);
|
::new((void*)p) T(v);
|
||||||
@@ -447,14 +464,16 @@ struct alloc_has_destroy<A, T,
|
|||||||
} /* detail */
|
} /* detail */
|
||||||
|
|
||||||
template<class A, class T>
|
template<class A, class T>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_destroy<A, T>::value>::type
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
|
detail::alloc_has_destroy<A, T>::value>::type
|
||||||
allocator_destroy(A& a, T* p)
|
allocator_destroy(A& a, T* p)
|
||||||
{
|
{
|
||||||
a.destroy(p);
|
a.destroy(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A, class T>
|
template<class A, class T>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_destroy<A, T>::value>::type
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
|
!detail::alloc_has_destroy<A, T>::value>::type
|
||||||
allocator_destroy(A&, T* p)
|
allocator_destroy(A&, T* p)
|
||||||
{
|
{
|
||||||
p->~T();
|
p->~T();
|
||||||
@@ -479,16 +498,18 @@ struct alloc_has_max_size<A,
|
|||||||
} /* detail */
|
} /* detail */
|
||||||
|
|
||||||
template<class A>
|
template<class A>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_max_size<A>::value,
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
typename allocator_size_type<A>::type>::type
|
detail::alloc_has_max_size<A>::value,
|
||||||
|
typename allocator_size_type<A>::type>::type
|
||||||
allocator_max_size(const A& a)
|
allocator_max_size(const A& a)
|
||||||
{
|
{
|
||||||
return a.max_size();
|
return a.max_size();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A>
|
template<class A>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_max_size<A>::value,
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
typename allocator_size_type<A>::type>::type
|
!detail::alloc_has_max_size<A>::value,
|
||||||
|
typename allocator_size_type<A>::type>::type
|
||||||
allocator_max_size(const A&)
|
allocator_max_size(const A&)
|
||||||
{
|
{
|
||||||
return (std::numeric_limits<typename
|
return (std::numeric_limits<typename
|
||||||
@@ -514,14 +535,16 @@ struct alloc_has_soccc<A,
|
|||||||
} /* detail */
|
} /* detail */
|
||||||
|
|
||||||
template<class A>
|
template<class A>
|
||||||
inline typename detail::alloc_if<detail::alloc_has_soccc<A>::value, A>::type
|
inline typename detail::alloc_if<detail::alloc_enable<A>::value &&
|
||||||
|
detail::alloc_has_soccc<A>::value, A>::type
|
||||||
allocator_select_on_container_copy_construction(const A& a)
|
allocator_select_on_container_copy_construction(const A& a)
|
||||||
{
|
{
|
||||||
return a.select_on_container_copy_construction();
|
return a.select_on_container_copy_construction();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class A>
|
template<class A>
|
||||||
inline typename detail::alloc_if<!detail::alloc_has_soccc<A>::value, A>::type
|
inline typename detail::alloc_if<!detail::alloc_enable<A>::value ||
|
||||||
|
!detail::alloc_has_soccc<A>::value, A>::type
|
||||||
allocator_select_on_container_copy_construction(const A& a)
|
allocator_select_on_container_copy_construction(const A& a)
|
||||||
{
|
{
|
||||||
return a;
|
return a;
|
||||||
|
Reference in New Issue
Block a user