boost_mirror/unordered
1
0
Fork 0
mirror of https://github.com/boostorg/unordered.git synced 2025-05-12 14:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on Boost.Detail

Browse Source
This commit is contained in:
Christian Mazakas 2022-06-20 07:50:12 -07:00
parent b1a9cde690
commit f1481f0deb
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/unordered/detail/implementation.hpp
View File

@ -19,7 +19,6 @@
#include <boost/core/bit.hpp> #include <boost/core/bit.hpp>
#include <boost/core/no_exceptions_support.hpp> #include <boost/core/no_exceptions_support.hpp>
#include <boost/core/pointer_traits.hpp> #include <boost/core/pointer_traits.hpp>
#include <boost/detail/select_type.hpp>
#include <boost/limits.hpp> #include <boost/limits.hpp>
#include <boost/move/move.hpp> #include <boost/move/move.hpp>
#include <boost/preprocessor/arithmetic/inc.hpp> #include <boost/preprocessor/arithmetic/inc.hpp>
@ -1698,9 +1697,8 @@ namespace boost {
}; };
template <typename T> template <typename T>
struct rv_ref struct rv_ref : boost::conditional<boost::is_class<T>::value,
: boost::detail::if_true<boost::is_class<T>::value>:: boost::unordered::detail::rv_ref_impl<T>,
BOOST_NESTED_TEMPLATE then<boost::unordered::detail::rv_ref_impl<T>,
please_ignore_this_overload>::type please_ignore_this_overload>::type
{ {
}; };
@ -3507,8 +3505,8 @@ namespace boost {
sizeof(choice2::type) sizeof(choice2::type)
}; };
typedef typename boost::detail::if_true<value>::BOOST_NESTED_TEMPLATE typedef
then<Key const&, no_key>::type type; typename boost::conditional<value, Key const&, no_key>::type type;
}; };
template <class ValueType> struct set_extractor template <class ValueType> struct set_extractor

7
test/helpers/random_values.hpp
View File

@ -9,8 +9,8 @@
#include "./generators.hpp" #include "./generators.hpp"
#include "./list.hpp" #include "./list.hpp"
#include "./metafunctions.hpp" #include "./metafunctions.hpp"
#include <boost/type_traits/conditional.hpp>
#include <algorithm> #include <algorithm>
#include <boost/detail/select_type.hpp>
namespace test { namespace test {
template <class X> struct unordered_generator_set template <class X> struct unordered_generator_set
@ -69,9 +69,8 @@ namespace test {
template <class X> template <class X>
struct unordered_generator_base struct unordered_generator_base
: public boost::detail::if_true<test::is_set<X>::value>:: : public boost::conditional<test::is_set<X>::value,
BOOST_NESTED_TEMPLATE then<test::unordered_generator_set<X>, test::unordered_generator_set<X>, test::unordered_generator_map<X> >
test::unordered_generator_map<X> >
{ {
}; };