Skip to content

Commit 97a5947

Browse files
committed
fixed a clang bug
1 parent 710db4c commit 97a5947

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

core/include/webpp/memory/allocator_concepts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ namespace webpp {
253253

254254
template <typename AllocDescTypes>
255255
using resource_extractor =
256-
typename istl::filter_parameters<istl::templated_negation<stl::is_void>::type,
256+
typename istl::filter_parameters<istl::templated_negation<stl::is_void>::template type,
257257
typename details::resource_extractor_impl<AllocDescTypes>::type>::type;
258258

259259

core/include/webpp/std/type_traits.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -634,15 +634,15 @@ namespace webpp::istl {
634634

635635
// details for filter_parameters
636636
namespace details {
637-
template <template <typename> typename Concept,
637+
template <template <typename...> typename Concept,
638638
typename Head,
639639
typename Tail,
640640
template <typename...>
641641
typename TupleType>
642642
struct filter_parameters_impl;
643643

644644
// moving This from Heads to the Tails list
645-
template <template <typename> typename Concept,
645+
template <template <typename...> typename Concept,
646646
typename... Heads,
647647
typename This,
648648
typename... Tails,
@@ -655,7 +655,7 @@ namespace webpp::istl {
655655
: filter_parameters_impl<Concept, TupleType<Heads...>, TupleType<This, Tails...>, TupleType> {};
656656

657657
// remove the first one
658-
template <template <typename> typename Concept,
658+
template <template <typename...> typename Concept,
659659
typename... Heads,
660660
typename This,
661661
typename... Tails,
@@ -668,7 +668,7 @@ namespace webpp::istl {
668668
: filter_parameters_impl<Concept, TupleType<Heads...>, TupleType<Tails...>, TupleType> {};
669669

670670
// We're at the end of the line, no Heads left to check
671-
template <template <typename> typename Concept,
671+
template <template <typename...> typename Concept,
672672
typename... Tails,
673673
template <typename...>
674674
typename TupleType>
@@ -688,18 +688,18 @@ namespace webpp::istl {
688688
* };
689689
* @endcode
690690
*/
691-
template <template <typename> typename Concept, typename Tup>
691+
template <template <typename...> typename Concept, typename Tup>
692692
struct filter_parameters;
693693

694-
template <template <typename> typename Concept,
694+
template <template <typename...> typename Concept,
695695
typename... Types,
696696
template <typename...>
697697
typename TupleType>
698698
struct filter_parameters<Concept, TupleType<Types...>>
699699
: public details::filter_parameters_impl<Concept, TupleType<Types...>, TupleType<>, TupleType> {};
700700

701701

702-
template <template <typename> typename Concept, typename Tup>
702+
template <template <typename...> typename Concept, typename Tup>
703703
using filter_parameters_t = typename filter_parameters<Concept, Tup>::type;
704704

705705

@@ -745,7 +745,6 @@ namespace webpp::istl {
745745
using type = stl::negation<ConceptType<T...>>;
746746
};
747747

748-
749748
/**
750749
* Replace TupleT<OldT...> with TupleT<NewT...>
751750
*/

0 commit comments

Comments
 (0)