diff --git a/sprout/type_traits/is_convert_constructible.hpp b/sprout/type_traits/is_convert_constructible.hpp index ffa192e9..d1b46809 100644 --- a/sprout/type_traits/is_convert_constructible.hpp +++ b/sprout/type_traits/is_convert_constructible.hpp @@ -21,8 +21,7 @@ namespace sprout { template struct is_convert_constructible_test { public: - template - static sprout::true_type test(To); + static sprout::true_type test(T); static sprout::false_type test(...); }; } // namespace detail @@ -32,8 +31,8 @@ namespace sprout { {}; #if SPROUT_USE_VARIABLE_TEMPLATES - template - SPROUT_STATIC_CONSTEXPR bool is_convert_constructible_v = sprout::is_convert_constructible::value; + template + SPROUT_STATIC_CONSTEXPR bool is_convert_constructible_v = sprout::is_convert_constructible::value; #endif // #if SPROUT_USE_VARIABLE_TEMPLATES } // namespace sprout diff --git a/testspr/iterator.hpp b/testspr/iterator.hpp index 8858a7d8..9a3f2852 100644 --- a/testspr/iterator.hpp +++ b/testspr/iterator.hpp @@ -15,6 +15,8 @@ #include #include #include +#include +#include namespace testspr { // @@ -47,11 +49,11 @@ namespace testspr { explicit SPROUT_CONSTEXPR reduct_iterator(iterator_type it) : current(it) {} - template + template::value>::type = sprout::enabler> SPROUT_CONSTEXPR reduct_iterator(reduct_iterator const& it) : current(it.base()) {} - template + template::value>::type = sprout::enabler> reduct_iterator& operator=(reduct_iterator const& it) { reduct_iterator temp(it); temp.swap(*this);