Merge branch 'master' of github.com:taylor001/crown

src/core/containers/sort_map.h

@@ -16,6 +16,9 @@ namespace crown
 /// @ingroup Containers
 namespace sort_map
 {
+	/// Returns the number of items in the map @m.
+	template <typename TKey, typename TValue, typename Compare> uint32_t size(const SortMap<TKey, TValue, Compare>& m);
+
 	/// Returns whether the @a key exists in the map.
 	template <typename TKey, typename TValue, typename Compare> bool has(const SortMap<TKey, TValue, Compare>& m, const TKey& key);
 
@@ -92,6 +95,12 @@ namespace sort_map_internal
 
 namespace sort_map
 {
+	template <typename TKey, typename TValue, typename Compare>
+	inline uint32_t size(const SortMap<TKey, TValue, Compare>& m)
+	{
+		return vector::size(m._data);
+	}
+
 	template <typename TKey, typename TValue, typename Compare>
 	inline bool has(const SortMap<TKey, TValue, Compare>& m, const TKey& key)
 	{

src/core/math/math_utils.h

@@ -49,14 +49,6 @@ inline T clamp(const T& min, const T& max, const T& val)
 	return val > max ? max : val < min ? min : val;
 }
 
-template <typename T>
-inline void swap(T& a, T& b)
-{
-	T tmp = a;
-	a = b;
-	b = tmp;
-}
-
 inline float to_rad(float deg)
 {
 	return deg * float(PI / 180.0);