Skip to content

Commit 916c8a7

Browse files
committed
Remove uses of boost::type_with_alignment
1 parent beaf20e commit 916c8a7

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

include/boost/smart_ptr/allocate_shared_array.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Distributed under the Boost Software License, Version 1.0.
1313
#include <boost/core/first_scalar.hpp>
1414
#include <boost/smart_ptr/shared_ptr.hpp>
1515
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
16-
#include <boost/type_traits/type_with_alignment.hpp>
1716
#include <type_traits>
1817

1918
namespace boost {
@@ -137,7 +136,7 @@ class sp_array_creator {
137136
offset = sp_array_offset<T, element>::value
138137
};
139138

140-
typedef typename boost::type_with_alignment<sp_array_alignment<T,
139+
typedef typename sp_type_with_alignment<sp_array_alignment<T,
141140
element>::value>::type type;
142141

143142
public:

include/boost/smart_ptr/detail/quick_allocator.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121
#include <boost/config.hpp>
2222

2323
#include <boost/smart_ptr/detail/lightweight_mutex.hpp>
24-
#include <boost/type_traits/type_with_alignment.hpp>
24+
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
2525

2626
#include <type_traits>
2727
#include <new> // ::operator new, ::operator delete
2828
#include <cstddef> // std::size_t
2929

3030
namespace boost
3131
{
32-
3332
namespace detail
3433
{
3534

3635
template<unsigned size, unsigned align_> union freeblock
3736
{
38-
typedef typename boost::type_with_alignment<align_>::type aligner_type;
37+
typedef typename sp_type_with_alignment<align_>::type aligner_type;
3938
aligner_type aligner;
4039
char bytes[size];
4140
freeblock * next;

include/boost/smart_ptr/make_shared_object.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See http://www.boost.org/libs/smart_ptr/ for documentation.
1313

1414
#include <boost/smart_ptr/shared_ptr.hpp>
15-
#include <boost/type_traits/type_with_alignment.hpp>
15+
#include <boost/smart_ptr/detail/sp_type_traits.hpp>
1616
#include <boost/config.hpp>
1717
#include <utility>
1818
#include <cstddef>
@@ -21,7 +21,6 @@
2121

2222
namespace boost
2323
{
24-
2524
namespace detail
2625
{
2726

@@ -30,7 +29,7 @@ template< std::size_t N, std::size_t A > struct sp_aligned_storage
3029
union type
3130
{
3231
char data_[ N ];
33-
typename boost::type_with_alignment< A >::type align_;
32+
typename sp_type_with_alignment< A >::type align_;
3433
};
3534
};
3635

0 commit comments

Comments
 (0)