Fixed unordered_erase(dynarray &, ptrdiff_t) to always be a better match

than generic unordered_erase(RandomAccessContainer &, Integral).
Also renamed template parameter Integral to Integer

range_algo.h

@@ -23,15 +23,15 @@ namespace oel
 *
 * Constant complexity (compared to linear in the distance between position and last for standard erase).
 * The end iterator and any iterator, pointer and reference referring to the last element may become invalid. */
-template< typename RandomAccessContainer, typename Integral >
-constexpr void unordered_erase(RandomAccessContainer & c, Integral index)
+template< typename Integer, typename RandomAccessContainer >
+constexpr void unordered_erase(RandomAccessContainer & c, Integer index)
 {
 	c[index] = std::move(c.back());
 	c.pop_back();
 }
-//! See unordered_erase(RandomAccessContainer &, Integral) or dynarray::unordered_erase
-template< typename T, typename A >  inline
-void unordered_erase(dynarray<T, A> & d, ptrdiff_t index)  { d.unordered_erase(d.begin() + index); }
+//! See unordered_erase(RandomAccessContainer &, Integer) or dynarray::unordered_erase
+template< typename Integer, typename T, typename A >  inline
+void unordered_erase(dynarray<T, A> & d, Integer index)  { d.unordered_erase(d.begin() + index); }
 
 /**
 * @brief Erase from container all elements for which predicate returns true

util.h

@@ -67,10 +67,10 @@ using oel::ssize;
 /** @brief Check if index is valid (within bounds for operator[])
 *
 * Requires that `r.size()` or `end(r) - begin(r)` is valid. */
-template< typename Integral, typename SizedRangeLike >
-constexpr bool index_valid(SizedRangeLike & r, Integral index)
+template< typename Integer, typename SizedRangeLike >
+constexpr bool index_valid(SizedRangeLike & r, Integer index)
 	{
-		static_assert( sizeof(Integral) >= sizeof _detail::Size(r) or std::is_unsigned_v<Integral>,
+		static_assert( sizeof(Integer) >= sizeof _detail::Size(r) or std::is_unsigned_v<Integer>,
 			"Mismatched index type, please use a wider integer (or unsigned)" );
 		return as_unsigned(index) < as_unsigned(_detail::Size(r));
 	}