summaryrefslogtreecommitdiffhomepage
path: root/compat
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-02-11 18:40:27 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-02-11 20:21:35 +0100
commit24f8f904f3975832b77e18957dc41d2372deebc5 (patch)
treed6097eec1bd3118487d044dec3d8f28b7e0ac147 /compat
parent15a8ad060653a521bcd175b495455a0e09377050 (diff)
less header namespace pollution
Diffstat (limited to 'compat')
-rw-r--r--compat/simple-mat.hpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/compat/simple-mat.hpp b/compat/simple-mat.hpp
index 87e1ae83..d42a2fe8 100644
--- a/compat/simple-mat.hpp
+++ b/compat/simple-mat.hpp
@@ -79,33 +79,32 @@ public:
template<int P = h_> std::enable_if_t<equals<P, 1, 3>::value, num&>
constexpr inline operator()(unsigned i) & { return data[0][i]; }
-#define OPENTRACK_ASSERT_SWIZZLE static_assert(P == h_ && Q == w_)
+#define OTR_MAT_ASSERT_SWIZZLE static_assert(P == h_ && Q == w_)
// const variants
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 1, 4>::value, num>
- constexpr inline x() const& { OPENTRACK_ASSERT_SWIZZLE; return operator()(0); }
+ constexpr inline x() const& { OTR_MAT_ASSERT_SWIZZLE; return operator()(0); }
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 2, 4>::value, num>
- constexpr inline y() const& { OPENTRACK_ASSERT_SWIZZLE; return operator()(1); }
+ constexpr inline y() const& { OTR_MAT_ASSERT_SWIZZLE; return operator()(1); }
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 3, 4>::value, num>
- constexpr inline z() const& { OPENTRACK_ASSERT_SWIZZLE; return operator()(2); }
+ constexpr inline z() const& { OTR_MAT_ASSERT_SWIZZLE; return operator()(2); }
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 4, 4>::value, num>
- constexpr inline w() const& { OPENTRACK_ASSERT_SWIZZLE; return operator()(3); }
+ constexpr inline w() const& { OTR_MAT_ASSERT_SWIZZLE; return operator()(3); }
// mutable variants
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 1, 4>::value, num&>
- constexpr inline x() & { OPENTRACK_ASSERT_SWIZZLE; return operator()(0); }
+ constexpr inline x() & { OTR_MAT_ASSERT_SWIZZLE; return operator()(0); }
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 2, 4>::value, num&>
- constexpr inline y() & { OPENTRACK_ASSERT_SWIZZLE; return operator()(1); }
+ constexpr inline y() & { OTR_MAT_ASSERT_SWIZZLE; return operator()(1); }
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 3, 4>::value, num&>
- constexpr inline z() & { OPENTRACK_ASSERT_SWIZZLE; return operator()(2); }
+ constexpr inline z() & { OTR_MAT_ASSERT_SWIZZLE; return operator()(2); }
template<int P = h_, int Q = w_> std::enable_if_t<maybe_add_swizzle<P, Q, 4, 4>::value, num&>
- constexpr inline w() & { OPENTRACK_ASSERT_SWIZZLE; return operator()(3); }
template<int h_pos, int w_pos>
constexpr Mat<num, h_ - h_pos, w_ - w_pos> slice() const
@@ -119,6 +118,7 @@ public:
template<int off> std::enable_if_t<!equals<h_, 1, 2>::value && equals<w_, 1, 1>::value,
Mat<num, h_ - off, 1>>
slice() const { return ((double const*)*this) + off; }
+ constexpr inline w() & { OTR_MAT_ASSERT_SWIZZLE; return operator()(3); }
template<int P = h_, int Q = w_>
std::enable_if_t<is_vector<P, Q>::value, num>