mirror of
https://github.com/boostorg/smart_ptr.git
synced 2025-07-30 04:47:12 +02:00
Remove uses of boost::type_with_alignment
This commit is contained in:
@ -13,7 +13,6 @@ Distributed under the Boost Software License, Version 1.0.
|
|||||||
#include <boost/core/first_scalar.hpp>
|
#include <boost/core/first_scalar.hpp>
|
||||||
#include <boost/smart_ptr/shared_ptr.hpp>
|
#include <boost/smart_ptr/shared_ptr.hpp>
|
||||||
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
|
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
|
||||||
#include <boost/type_traits/type_with_alignment.hpp>
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
namespace boost {
|
namespace boost {
|
||||||
@ -137,7 +136,7 @@ class sp_array_creator {
|
|||||||
offset = sp_array_offset<T, element>::value
|
offset = sp_array_offset<T, element>::value
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef typename boost::type_with_alignment<sp_array_alignment<T,
|
typedef typename sp_type_with_alignment<sp_array_alignment<T,
|
||||||
element>::value>::type type;
|
element>::value>::type type;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
|
|
||||||
#include <boost/smart_ptr/detail/lightweight_mutex.hpp>
|
#include <boost/smart_ptr/detail/lightweight_mutex.hpp>
|
||||||
#include <boost/type_traits/type_with_alignment.hpp>
|
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
|
||||||
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <new> // ::operator new, ::operator delete
|
#include <new> // ::operator new, ::operator delete
|
||||||
@ -29,13 +29,12 @@
|
|||||||
|
|
||||||
namespace boost
|
namespace boost
|
||||||
{
|
{
|
||||||
|
|
||||||
namespace detail
|
namespace detail
|
||||||
{
|
{
|
||||||
|
|
||||||
template<unsigned size, unsigned align_> union freeblock
|
template<unsigned size, unsigned align_> union freeblock
|
||||||
{
|
{
|
||||||
typedef typename boost::type_with_alignment<align_>::type aligner_type;
|
typedef typename sp_type_with_alignment<align_>::type aligner_type;
|
||||||
aligner_type aligner;
|
aligner_type aligner;
|
||||||
char bytes[size];
|
char bytes[size];
|
||||||
freeblock * next;
|
freeblock * next;
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
// See http://www.boost.org/libs/smart_ptr/ for documentation.
|
// See http://www.boost.org/libs/smart_ptr/ for documentation.
|
||||||
|
|
||||||
#include <boost/smart_ptr/shared_ptr.hpp>
|
#include <boost/smart_ptr/shared_ptr.hpp>
|
||||||
#include <boost/type_traits/type_with_alignment.hpp>
|
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
@ -21,7 +21,6 @@
|
|||||||
|
|
||||||
namespace boost
|
namespace boost
|
||||||
{
|
{
|
||||||
|
|
||||||
namespace detail
|
namespace detail
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -30,7 +29,7 @@ template< std::size_t N, std::size_t A > struct sp_aligned_storage
|
|||||||
union type
|
union type
|
||||||
{
|
{
|
||||||
char data_[ N ];
|
char data_[ N ];
|
||||||
typename boost::type_with_alignment< A >::type align_;
|
typename sp_type_with_alignment< A >::type align_;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user