From 2b4480b9fd11edf9ca3d953e15ece82ff4d90a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Thu, 10 Mar 2022 12:54:23 +0100 Subject: [PATCH] Fix compilation error due to using equal nat types. Use boost::move_detail::natN instead --- include/boost/container/detail/node_alloc_holder.hpp | 4 ++-- include/boost/container/detail/type_traits.hpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/boost/container/detail/node_alloc_holder.hpp b/include/boost/container/detail/node_alloc_holder.hpp index c0fab53..b313730 100644 --- a/include/boost/container/detail/node_alloc_holder.hpp +++ b/include/boost/container/detail/node_alloc_holder.hpp @@ -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 diff --git a/include/boost/container/detail/type_traits.hpp b/include/boost/container/detail/type_traits.hpp index 0c4f982..ffa061b 100644 --- a/include/boost/container/detail/type_traits.hpp +++ b/include/boost/container/detail/type_traits.hpp @@ -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;