Merge branch 'hashtable-variadic-fix' of https://github.com/bad-ed/intrusive into bad-ed-hashtable-variadic-fix

2019-01-02 02:13:37 +01:00
parent c02f485281 cbf83bbebb
commit 31c73c106e
1 changed files with 0 additions and 4 deletions
--- a/include/boost/intrusive/hashtable.hpp
+++ b/include/boost/intrusive/hashtable.hpp
@@ -3515,14 +3515,10 @@ class hashtable_impl
 };

 /// @cond
-#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
 template < class T
         , bool UniqueKeys
         , class PackedOptions
         >
-#else
-template <class T, bool UniqueKeys, class ...Options>
-#endif
 struct make_bucket_traits
 {
   //Real value traits must be calculated from options