diff --git a/Vc/common/simdize.h b/Vc/common/simdize.h index 760cb2129..5fa34d062 100644 --- a/Vc/common/simdize.h +++ b/Vc/common/simdize.h @@ -152,7 +152,7 @@ template struct Typelist; */ enum class Category { ///\internal No transformation - None, + NoTransformation, ///\internal simple Vector transformation ArithmeticVectorizable, ///\internal transform an input iterator to return vectorized entries @@ -186,7 +186,7 @@ constexpr Category iteratorCategories(int, ItCat * = nullptr) ? Category::OutputIterator : is_base_of::value ? Category::InputIterator - : Category::None; + : Category::NoTransformation; } /**\internal * This overload is selected for pointer types => RandomAccessIterator. @@ -201,7 +201,7 @@ constexpr enable_if::value, Category> iteratorCategories(floa */ template constexpr Category iteratorCategories(...) { - return Category::None; + return Category::NoTransformation; } /**\internal @@ -225,10 +225,10 @@ template constexpr Category typeCategory() is_same::value || is_same::value || is_same::value) ? Category::ArithmeticVectorizable - : iteratorCategories(int()) != Category::None + : iteratorCategories(int()) != Category::NoTransformation ? iteratorCategories(int()) : is_class_template::value ? Category::ClassTemplate - : Category::None; + : Category::NoTransformation; } /**\internal @@ -279,7 +279,7 @@ struct ReplaceTypes : public The_simdization_for_the_requested_type_is_not_imple * Specialization of ReplaceTypes that is used for types that should not be transformed by * simdize. */ -template struct ReplaceTypes +template struct ReplaceTypes { typedef T type; }; diff --git a/godbolt/algorithm b/godbolt/algorithm index 5f57383ff..7f8e41d3e 100644 --- a/godbolt/algorithm +++ b/godbolt/algorithm @@ -335,7 +335,7 @@ using std::conditional; using std::size_t; template struct Typelist; enum class Category { -None, +NoTransformation, ArithmeticVectorizable, InputIterator, OutputIterator, @@ -357,7 +357,7 @@ return is_base_of::value ? Category::OutputIterator : is_base_of::value ? Category::InputIterator -: Category::None; +: Category::NoTransformation; } template constexpr enable_if::value, Category> iteratorCategories(float) @@ -366,7 +366,7 @@ return Category::RandomAccessIterator; } template constexpr Category iteratorCategories(...) { -return Category::None; +return Category::NoTransformation; } template struct is_class_template : public false_type { @@ -382,10 +382,10 @@ is_same::value || is_same::value || is_same::value || is_same::value || is_same::value) ? Category::ArithmeticVectorizable -: iteratorCategories(int()) != Category::None +: iteratorCategories(int()) != Category::NoTransformation ? iteratorCategories(int()) : is_class_template::value ? Category::ClassTemplate -: Category::None; +: Category::NoTransformation; } template ::value> constexpr size_t determine_tuple_size() @@ -408,7 +408,7 @@ template ()> struct ReplaceTypes : public The_simdization_for_the_requested_type_is_not_implemented { }; -template struct ReplaceTypes +template struct ReplaceTypes { typedef T type; };