diff --git a/README.md b/README.md index b05c9d6..ae9f889 100644 --- a/README.md +++ b/README.md @@ -96,9 +96,9 @@ public: explicit vec_base(T v); vec_base(T x, T y); - template < typename A > vec_base(const vec_base& xy); - template < typename A > explicit vec_base(const vec_base& xy); - template < typename A > explicit vec_base(const vec_base& xy); + template < typename U > vec_base(const vec_base& other); + template < typename U > explicit vec_base(const vec_base& other); + template < typename U > explicit vec_base(const vec_base& other); }; template < typename T > @@ -118,8 +118,8 @@ public: vec_base(const vec_base& xy, T z); vec_base(T x, const vec_base& yz); - template < typename A > vec_base(const vec_base& xyz); - template < typename A > explicit vec_base(const vec_base& xyz); + template < typename U > vec_base(const vec_base& other); + template < typename U > explicit vec_base(const vec_base& other); }; template < typename T > @@ -144,7 +144,7 @@ public: vec_base(const vec_base& xyz, T w); vec_base(T x, const vec_base& yzw); - template < typename A > vec_base(const vec_base& xyzw); + template < typename U > vec_base(const vec_base& other); }; template < typename T, size_t Size > @@ -253,9 +253,9 @@ public: const row_type& row0, const row_type& row1); - template < typename A > mat_base(const mat_base& other); - template < typename A > explicit mat_base(const mat_base& other); - template < typename A > explicit mat_base(const mat_base& other); + template < typename U > mat_base(const mat_base& other); + template < typename U > explicit mat_base(const mat_base& other); + template < typename U > explicit mat_base(const mat_base& other); }; template < typename T > @@ -288,9 +288,9 @@ public: const mat_base& m, const vec_base& v); - template < typename A > mat_base(const mat_base& other); - template < typename A > explicit mat_base(const mat_base& other); - template < typename A > explicit mat_base(const mat_base& other); + template < typename U > mat_base(const mat_base& other); + template < typename U > explicit mat_base(const mat_base& other); + template < typename U > explicit mat_base(const mat_base& other); }; template < typename T > @@ -325,9 +325,9 @@ public: const mat_base& m, const vec_base& v); - template < typename A > mat_base(const mat_base& other); - template < typename A > explicit mat_base(const mat_base& other); - template < typename A > explicit mat_base(const mat_base& other); + template < typename U > mat_base(const mat_base& other); + template < typename U > explicit mat_base(const mat_base& other); + template < typename U > explicit mat_base(const mat_base& other); }; template < typename T, size_t Size > @@ -427,8 +427,8 @@ public: qua_base(const vec& v, T s); explicit qua_base(const vec& vs); - template < typename A > qua_base(const qua_base& other); - template < typename A > explicit operator vec() const; + template < typename U > qua_base(const qua_base& other); + template < typename U > explicit operator vec() const; }; template < typename T > diff --git a/headers/vmath.hpp/vmath_mat.hpp b/headers/vmath.hpp/vmath_mat.hpp index a322373..0d27489 100644 --- a/headers/vmath.hpp/vmath_mat.hpp +++ b/headers/vmath.hpp/vmath_mat.hpp @@ -52,18 +52,18 @@ namespace vmath_hpp::detail const row_type& row1) : rows{row0, row1} {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr mat_base(const mat_base& other): mat_base( row_type{other.rows[0]}, row_type{other.rows[1]}) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit mat_base(const mat_base& other): mat_base( row_type{other.rows[0]}, row_type{other.rows[1]}) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit mat_base(const mat_base& other): mat_base( row_type{other.rows[0]}, row_type{other.rows[1]}) {} }; @@ -117,20 +117,20 @@ namespace vmath_hpp::detail {m.rows[1], T{0}}, {v, T{1}}} {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr mat_base(const mat_base& other): mat_base( row_type{other.rows[0]}, row_type{other.rows[1]}, row_type{other.rows[2]}) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit mat_base(const mat_base& other): mat_base( row_type{other.rows[0], T{0}}, row_type{other.rows[1], T{0}}, row_type{T{0}, T{0}, T{1}}) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit mat_base(const mat_base& other): mat_base( row_type{other.rows[0]}, row_type{other.rows[1]}, row_type{other.rows[2]}) {} @@ -191,22 +191,22 @@ namespace vmath_hpp::detail {m.rows[2], T{0}}, {v, T{1}}} {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr mat_base(const mat_base& other): mat_base( row_type{other.rows[0]}, row_type{other.rows[1]}, row_type{other.rows[2]}, row_type{other.rows[3]}) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit mat_base(const mat_base& other): mat_base( row_type{other.rows[0], T{0}, T{0}}, row_type{other.rows[1], T{0}, T{0}}, row_type{T{0}, T{0}, T{1}, T{0}}, row_type{T{0}, T{0}, T{0}, T{1}}) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit mat_base(const mat_base& other): mat_base( + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit mat_base(const mat_base& other): mat_base( row_type{other.rows[0], T{0}}, row_type{other.rows[1], T{0}}, row_type{other.rows[2], T{0}}, diff --git a/headers/vmath.hpp/vmath_qua.hpp b/headers/vmath.hpp/vmath_qua.hpp index 1acde63..e77e58d 100644 --- a/headers/vmath.hpp/vmath_qua.hpp +++ b/headers/vmath.hpp/vmath_qua.hpp @@ -30,11 +30,11 @@ namespace vmath_hpp::detail constexpr qua_base(const vec& v, T s): v{v}, s{s} {} constexpr explicit qua_base(const vec& vs): v{vs[0], vs[1], vs[2]}, s{vs[3]} {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr qua_base(const qua_base& other): qua_base(other.v, other.s) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr qua_base(const qua_base& other): qua_base(other.v, other.s) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit operator vec() const { return vec(v, s); } + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit operator vec() const { return vec(v, s); } [[nodiscard]] constexpr T& operator[](std::size_t index) noexcept { switch ( index ) { diff --git a/headers/vmath.hpp/vmath_vec.hpp b/headers/vmath.hpp/vmath_vec.hpp index fd37d60..5059ce6 100644 --- a/headers/vmath.hpp/vmath_vec.hpp +++ b/headers/vmath.hpp/vmath_vec.hpp @@ -28,14 +28,14 @@ namespace vmath_hpp::detail constexpr explicit vec_base(T v): x{v}, y{v} {} constexpr vec_base(T x, T y): x{x}, y{y} {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr vec_base(const vec_base& xy): vec_base(xy[0], xy[1]) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr vec_base(const vec_base& other): vec_base(other[0], other[1]) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit vec_base(const vec_base& xy): vec_base(xy[0], xy[1]) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit vec_base(const vec_base& other): vec_base(other[0], other[1]) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit vec_base(const vec_base& xy): vec_base(xy[0], xy[1]) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit vec_base(const vec_base& other): vec_base(other[0], other[1]) {} [[nodiscard]] constexpr T& operator[](std::size_t index) noexcept { switch ( index ) { @@ -72,11 +72,11 @@ namespace vmath_hpp::detail constexpr vec_base(const vec_base& xy, T z): vec_base(xy[0], xy[1], z) {} constexpr vec_base(T x, const vec_base& yz): vec_base(x, yz[0], yz[1]) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr vec_base(const vec_base& xyz): vec_base(xyz[0], xyz[1], xyz[2]) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr vec_base(const vec_base& other): vec_base(other[0], other[1], other[2]) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr explicit vec_base(const vec_base& xyz): vec_base(xyz[0], xyz[1], xyz[2]) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr explicit vec_base(const vec_base& other): vec_base(other[0], other[1], other[2]) {} [[nodiscard]] constexpr T& operator[](std::size_t index) noexcept { switch ( index ) { @@ -120,8 +120,8 @@ namespace vmath_hpp::detail constexpr vec_base(const vec_base& xyz, T w): vec_base(xyz[0], xyz[1], xyz[2], w) {} constexpr vec_base(T x, const vec_base& yzw): vec_base(x, yzw[0], yzw[1], yzw[2]) {} - template < typename A, std::enable_if_t, int> = 0 > - constexpr vec_base(const vec_base& xyzw): vec_base(xyzw[0], xyzw[1], xyzw[2], xyzw[3]) {} + template < typename U, std::enable_if_t, int> = 0 > + constexpr vec_base(const vec_base& other): vec_base(other[0], other[1], other[2], other[3]) {} [[nodiscard]] constexpr T& operator[](std::size_t index) noexcept { switch ( index ) {