summaryrefslogtreecommitdiff
path: root/boost/intrusive
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 06:24:45 (GMT)
committerDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 06:24:45 (GMT)
commit5ce1cfc2525b06c0a9e38531813781de0281c96d (patch)
tree19cc66c6cf6396db288813b2558cc350f1deede2 /boost/intrusive
parent3c1df2168531ad5580076ae08d529054689aeedd (diff)
downloadboost-5ce1cfc2525b06c0a9e38531813781de0281c96d.zip
boost-5ce1cfc2525b06c0a9e38531813781de0281c96d.tar.gz
boost-5ce1cfc2525b06c0a9e38531813781de0281c96d.tar.bz2
Imported Upstream version 1.71.0upstream/1.71.0upstream
Diffstat (limited to 'boost/intrusive')
-rw-r--r--boost/intrusive/detail/workaround.hpp5
-rw-r--r--boost/intrusive/pack_options.hpp6
-rw-r--r--boost/intrusive/treap.hpp2
-rw-r--r--boost/intrusive/treap_set.hpp4
4 files changed, 14 insertions, 3 deletions
diff --git a/boost/intrusive/detail/workaround.hpp b/boost/intrusive/detail/workaround.hpp
index a9e1570..f0cfaf2 100644
--- a/boost/intrusive/detail/workaround.hpp
+++ b/boost/intrusive/detail/workaround.hpp
@@ -23,6 +23,11 @@
#include <boost/config.hpp>
#endif
+// MSVC-12 ICEs when variadic templates are enabled.
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && (!defined(BOOST_MSVC) || BOOST_MSVC >= 1900)
+ #define BOOST_INTRUSIVE_VARIADIC_TEMPLATES
+#endif
+
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#define BOOST_INTRUSIVE_PERFECT_FORWARDING
#endif
diff --git a/boost/intrusive/pack_options.hpp b/boost/intrusive/pack_options.hpp
index 944243f..ff07678 100644
--- a/boost/intrusive/pack_options.hpp
+++ b/boost/intrusive/pack_options.hpp
@@ -209,6 +209,12 @@ struct do_pack<typelist<Prev, Last> >
typedef typename Prev::template pack<Last> type;
};
+template<class ...Others>
+struct do_pack<typelist<void, Others...> >
+{
+ typedef typename do_pack<typelist<Others...> >::type type;
+};
+
template<class Prev, class ...Others>
struct do_pack<typelist<Prev, Others...> >
{
diff --git a/boost/intrusive/treap.hpp b/boost/intrusive/treap.hpp
index 5656975..d5e3c0c 100644
--- a/boost/intrusive/treap.hpp
+++ b/boost/intrusive/treap.hpp
@@ -82,7 +82,7 @@ struct treap_tag;
//! The container supports the following options:
//! \c base_hook<>/member_hook<>/value_traits<>,
//! \c constant_time_size<>, \c size_type<>,
-//! \c compare<> and \c priority_compare<>
+//! \c compare<>, \c priority<> and \c priority_of_value<>
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class T, class ...Options>
#else
diff --git a/boost/intrusive/treap_set.hpp b/boost/intrusive/treap_set.hpp
index 6c0ea3b..31d0f6a 100644
--- a/boost/intrusive/treap_set.hpp
+++ b/boost/intrusive/treap_set.hpp
@@ -41,7 +41,7 @@ class treap_multiset_impl;
//! The container supports the following options:
//! \c base_hook<>/member_hook<>/value_traits<>,
//! \c constant_time_size<>, \c size_type<>,
-//! \c compare<> and \c priority_compare<>
+//! \c compare<>, \c priority<> and \c priority_of_value<>
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class T, class ...Options>
#else
@@ -600,7 +600,7 @@ class treap_set
//! The container supports the following options:
//! \c base_hook<>/member_hook<>/value_traits<>,
//! \c constant_time_size<>, \c size_type<>,
-//! \c compare<> and \c priority_compare<>
+//! \c compare<>, \c priority<> and \c priority_of_value<>
#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class T, class ...Options>
#else