feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Fix compilation error due to using equal nat types. Use boost::move_detail::natN instead

Browse Source
This commit is contained in:
Ion Gaztañaga
2022-03-10 12:54:23 +01:00
parent 93741ee6f2
commit 2b4480b9fd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/container/detail/node_alloc_holder.hpp
View File

@ -221,10 +221,10 @@ struct node_alloc_holder
, ICont, hasher, dtl::nat3) intrusive_val_hasher;
typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT
(boost::container::dtl::
, ICont, bucket_traits, dtl::nat) intrusive_bucket_traits;
, ICont, bucket_traits, dtl::natN<0>) intrusive_bucket_traits;
typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT
(boost::container::dtl::
, ICont, bucket_type, dtl::nat2) intrusive_bucket_type;
, ICont, bucket_type, dtl::natN<1>) intrusive_bucket_type;
//In that case obtain the value predicate from the node predicate via predicate_type
//if intrusive_val_compare is node_compare<>, nat otherwise
typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT

1
include/boost/container/detail/type_traits.hpp
View File

@ -64,6 +64,7 @@ using ::boost::move_detail::aligned_storage;
using ::boost::move_detail::nat;
using ::boost::move_detail::nat2;
using ::boost::move_detail::nat3;
using ::boost::move_detail::natN;
using ::boost::move_detail::max_align_t;
using ::boost::move_detail::is_convertible;