Switch remaining regular operator overloadings to friend

doom · Aug 4, 2019 · 74d4292 · 74d4292
1 parent 394d8fa
commit 74d4292
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/include/st/traits.hpp b/include/st/traits.hpp
@@ -30,9 +30,9 @@ namespace st
         template <typename T, typename OtherOperandT = T, typename ReturnT = T>
         struct subtractable
         {
-            constexpr ReturnT operator-(const OtherOperandT &other) const noexcept
+            friend constexpr ReturnT operator-(const T &lhs, const OtherOperandT &rhs) noexcept
             {
-                return ReturnT(static_cast<const T *>(this)->value() - unwrap(other));
+                return ReturnT(lhs.value() - unwrap(rhs));
             }
         };
 
@@ -55,53 +55,53 @@ namespace st
         template <typename T, typename OtherOperandT = T, typename ReturnT = T>
         struct dividable
         {
-            constexpr ReturnT operator/(const OtherOperandT &other) const noexcept
+            friend constexpr ReturnT operator/(const T &lhs, const OtherOperandT &rhs) noexcept
             {
-                return ReturnT(static_cast<const T *>(this)->value() / unwrap(other));
+                return ReturnT(lhs.value() / unwrap(rhs));
             }
         };
 
         template <typename T, typename OtherOperandT = T, typename ReturnT = T>
         struct modulable
         {
-            constexpr ReturnT operator%(const OtherOperandT &other) const noexcept
+            friend constexpr ReturnT operator%(const T &lhs, const OtherOperandT &rhs) noexcept
             {
-                return ReturnT(static_cast<const T *>(this)->value() % unwrap(other));
+                return ReturnT(lhs.value() % unwrap(rhs));
             }
         };
 
         template <typename T>
         struct incrementable
         {
-            constexpr T &operator++() noexcept
+            friend constexpr T &operator++(T &t) noexcept
             {
-                ++static_cast<T *>(this)->value();
-                return *static_cast<T *>(this);
+                ++t.value();
+                return t;
             }
 
-            constexpr const T operator++(int) noexcept
+            friend constexpr const T operator++(T &t, int) noexcept
             {
-                T ret(static_cast<T *>(this)->value());
+                T ret(t);
 
-                ++(static_cast<T *>(this)->value());
+                ++t.value();
                 return ret;
             }
         };
 
         template <typename T>
         struct decrementable
         {
-            constexpr T &operator--() noexcept
+            friend constexpr T &operator--(T &t) noexcept
             {
-                --static_cast<T *>(this)->value();
-                return *static_cast<T *>(this);
+                --t.value();
+                return t;
             }
 
-            constexpr const T operator--(int) noexcept
+            friend constexpr const T operator--(T &t, int) noexcept
             {
-                T ret(static_cast<T *>(this)->value());
+                T ret(t);
 
-                --(static_cast<T *>(this)->value());
+                --t.value();
                 return ret;
             }
         };