Cleanup.

include/bx/inline/readerwriter.inl

@@ -101,15 +101,15 @@ namespace bx
 		switch (_whence)
 		{
 			case Whence::Begin:
-				m_pos = int64_clamp(_offset, 0, m_top);
+				m_pos = clamp<int64_t>(_offset, 0, m_top);
 				break;
 
 			case Whence::Current:
-				m_pos = int64_clamp(m_pos + _offset, 0, m_top);
+				m_pos = clamp<int64_t>(m_pos + _offset, 0, m_top);
 				break;
 
 			case Whence::End:
-				m_pos = int64_clamp(m_top - _offset, 0, m_top);
+				m_pos = clamp<int64_t>(m_top - _offset, 0, m_top);
 				break;
 		}
 
@@ -128,7 +128,7 @@ namespace bx
 		}
 
 		int64_t remainder = m_top-m_pos;
-		int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
+		int32_t size = uint32_min(_size, uint32_t(min<int64_t>(remainder, INT32_MAX) ) );
 		m_pos += size;
 		if (size != _size)
 		{
@@ -153,15 +153,15 @@ namespace bx
 		switch (_whence)
 		{
 			case Whence::Begin:
-				m_pos = int64_clamp(_offset, 0, m_top);
+				m_pos = clamp<int64_t>(_offset, 0, m_top);
 				break;
 
 			case Whence::Current:
-				m_pos = int64_clamp(m_pos + _offset, 0, m_top);
+				m_pos = clamp<int64_t>(m_pos + _offset, 0, m_top);
 				break;
 
 			case Whence::End:
-				m_pos = int64_clamp(m_top - _offset, 0, m_top);
+				m_pos = clamp<int64_t>(m_top - _offset, 0, m_top);
 				break;
 		}
 
@@ -173,7 +173,7 @@ namespace bx
 		BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
 
 		int64_t remainder = m_top-m_pos;
-		int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
+		int32_t size = uint32_min(_size, uint32_t(min<int64_t>(remainder, INT32_MAX) ) );
 		memCopy(_data, &m_data[m_pos], size);
 		m_pos += size;
 		if (size != _size)
@@ -216,15 +216,15 @@ namespace bx
 		switch (_whence)
 		{
 			case Whence::Begin:
-				m_pos = int64_clamp(_offset, 0, m_top);
+				m_pos = clamp<int64_t>(_offset, 0, m_top);
 				break;
 
 			case Whence::Current:
-				m_pos = int64_clamp(m_pos + _offset, 0, m_top);
+				m_pos = clamp<int64_t>(m_pos + _offset, 0, m_top);
 				break;
 
 			case Whence::End:
-				m_pos = int64_clamp(m_top - _offset, 0, m_top);
+				m_pos = clamp<int64_t>(m_top - _offset, 0, m_top);
 				break;
 		}
 
@@ -245,10 +245,10 @@ namespace bx
 		}
 
 		int64_t remainder = m_size-m_pos;
-		int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
+		int32_t size = uint32_min(_size, uint32_t(min<int64_t>(remainder, INT32_MAX) ) );
 		memCopy(&m_data[m_pos], _data, size);
 		m_pos += size;
-		m_top = int64_max(m_top, m_pos);
+		m_top = max(m_top, m_pos);
 		if (size != _size)
 		{
 			BX_ERROR_SET(_err, BX_ERROR_READERWRITER_WRITE, "MemoryWriter: write truncated.");

include/bx/inline/uint32_t.inl

@@ -595,34 +595,6 @@ namespace bx
 		return utof.flt;
 	}
 
-	inline uint16_t uint16_min(uint16_t _a, uint16_t _b)
-	{
-		return _a > _b ? _b : _a;
-	}
-
-	inline uint16_t uint16_max(uint16_t _a, uint16_t _b)
-	{
-		return _a < _b ? _b : _a;
-	}
-
-	inline int64_t int64_min(int64_t _a, int64_t _b)
-	{
-		return _a < _b ? _a : _b;
-	}
-
-	inline int64_t int64_max(int64_t _a, int64_t _b)
-	{
-		return _a > _b ? _a : _b;
-	}
-
-	inline int64_t int64_clamp(int64_t _a, int64_t _min, int64_t _max)
-	{
-		const int64_t min    = int64_min(_a, _max);
-		const int64_t result = int64_max(_min, min);
-
-		return result;
-	}
-
 	inline uint32_t uint64_cntbits_ref(uint64_t _val)
 	{
 		const uint32_t lo = uint32_t(_val&UINT32_MAX);

include/bx/uint32_t.h

@@ -204,21 +204,6 @@ namespace bx
 	///
 	float halfToFloat(uint16_t _a);
 
-	///
-	uint16_t uint16_min(uint16_t _a, uint16_t _b);
-
-	///
-	uint16_t uint16_max(uint16_t _a, uint16_t _b);
-
-	///
-	int64_t int64_min(int64_t _a, int64_t _b);
-
-	///
-	int64_t int64_max(int64_t _a, int64_t _b);
-
-	///
-	int64_t int64_clamp(int64_t _a, int64_t _min, int64_t _max);
-
 	///
 	uint32_t uint64_cntbits_ref(uint64_t _val);