Removed own implementation of std::index_sequence that was needed for GCC 4.9.

This commit is contained in:
Mathew Sutcliffe
2017-10-12 23:50:15 +01:00
parent 0b67466480
commit e8219efdde
6 changed files with 30 additions and 65 deletions

View File

@@ -16,11 +16,6 @@
#include <type_traits>
#include <cstddef>
#if ! (defined(Q_CC_GNU) && __GNUC__ <= 4)
//! \private
#define BLACK_HAS_INTEGER_SEQUENCE
#endif
namespace BlackMisc
{
@@ -28,36 +23,6 @@ namespace BlackMisc
namespace Private
{
#ifdef BLACK_HAS_INTEGER_SEQUENCE
template <typename T, T... Is>
using integer_sequence = std::integer_sequence<T, Is...>;
template <typename T, T C>
using make_integer_sequence = std::make_integer_sequence<T, C>;
#else // Our own implementation of std::integer_sequence (because not implemented by GCC 4.9)
template <typename T, T... Is>
struct integer_sequence
{
static const size_t size = sizeof...(Is);
typedef std::tuple<std::integral_constant<T, Is>...> tuple_type;
};
template <typename T, T I, T C, T... Is>
struct GenSequence
{
typedef typename GenSequence<T, I + 1, C, Is..., I>::type type;
};
template <typename T, T C, T... Is>
struct GenSequence<T, C, C, Is...>
{
typedef integer_sequence<T, Is...> type;
};
template <typename T, T C>
using make_integer_sequence = typename GenSequence<T, 0, C>::type;
#endif // ! BLACK_HAS_INTEGER_SEQUENCE
template <size_t... Is>
using index_sequence = integer_sequence<size_t, Is...>;
template <size_t C>
using make_index_sequence = make_integer_sequence<size_t, C>;
// Remove elements from an index_sequence for which a pack parameter fails to satisfy a given predicate.
template <typename, typename T, bool...>
struct MaskSequenceImpl
@@ -66,19 +31,19 @@ namespace BlackMisc
};
template <size_t I, size_t... Is, bool... Mask, size_t... Js>
struct MaskSequenceImpl<index_sequence<I, Is...>, index_sequence<Js...>, true, Mask...>
struct MaskSequenceImpl<std::index_sequence<I, Is...>, std::index_sequence<Js...>, true, Mask...>
{
using type = typename MaskSequenceImpl<index_sequence<Is...>, index_sequence<Js..., I>, Mask...>::type;
using type = typename MaskSequenceImpl<std::index_sequence<Is...>, std::index_sequence<Js..., I>, Mask...>::type;
};
template <size_t I, size_t... Is, bool... Mask, size_t... Js>
struct MaskSequenceImpl<index_sequence<I, Is...>, index_sequence<Js...>, false, Mask...>
struct MaskSequenceImpl<std::index_sequence<I, Is...>, std::index_sequence<Js...>, false, Mask...>
{
using type = typename MaskSequenceImpl<index_sequence<Is...>, index_sequence<Js...>, Mask...>::type;
using type = typename MaskSequenceImpl<std::index_sequence<Is...>, std::index_sequence<Js...>, Mask...>::type;
};
template <typename Seq, bool... Mask>
using MaskSequence = typename MaskSequenceImpl<Seq, Private::index_sequence<>, Mask...>::type;
using MaskSequence = typename MaskSequenceImpl<Seq, std::index_sequence<>, Mask...>::type;
} // namespace Private
//! \endcond