Cleanup.

include/bx/allocator.h

@@ -12,10 +12,6 @@
 #include <string.h> //::memmove
 #include <new>
 
-#if BX_CONFIG_ALLOCATOR_CRT
-#	include <malloc.h>
-#endif // BX_CONFIG_ALLOCATOR_CRT
-
 #if BX_CONFIG_ALLOCATOR_DEBUG
 #	define BX_ALLOC(_allocator, _size)                         bx::alloc(_allocator, _size, 0, __FILE__, __LINE__)
 #	define BX_REALLOC(_allocator, _ptr, _size)                 bx::realloc(_allocator, _ptr, _size, 0, __FILE__, __LINE__)
@@ -145,70 +141,6 @@ namespace bx
 		}
 	}
 
-#if BX_CONFIG_ALLOCATOR_CRT
-	class CrtAllocator : public AllocatorI
-	{
-	public:
-		CrtAllocator()
-		{
-		}
-
-		virtual ~CrtAllocator()
-		{
-		}
-
-		virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) BX_OVERRIDE
-		{
-			if (0 == _size)
-			{
-				if (NULL != _ptr)
-				{
-					if (BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT >= _align)
-					{
-						::free(_ptr);
-						return NULL;
-					}
-
-#	if BX_COMPILER_MSVC
-					BX_UNUSED(_file, _line);
-					_aligned_free(_ptr);
-#	else
-					bx::alignedFree(this, _ptr, _align, _file, _line);
-#	endif // BX_
-				}
-
-				return NULL;
-			}
-			else if (NULL == _ptr)
-			{
-				if (BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT >= _align)
-				{
-					return ::malloc(_size);
-				}
-
-#	if BX_COMPILER_MSVC
-				BX_UNUSED(_file, _line);
-				return _aligned_malloc(_size, _align);
-#	else
-				return bx::alignedAlloc(this, _size, _align, _file, _line);
-#	endif // BX_
-			}
-
-			if (BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT >= _align)
-			{
-				return ::realloc(_ptr, _size);
-			}
-
-#	if BX_COMPILER_MSVC
-			BX_UNUSED(_file, _line);
-			return _aligned_realloc(_ptr, _size, _align);
-#	else
-			return bx::alignedRealloc(this, _ptr, _size, _align, _file, _line);
-#	endif // BX_
-		}
-	};
-#endif // BX_CONFIG_ALLOCATOR_CRT
-
 } // namespace bx
 
 #endif // BX_ALLOCATOR_H_HEADER_GUARD

include/bx/crtimpl.h

@@ -0,0 +1,197 @@
+/*
+ * Copyright 2010-2016 Branimir Karadzic. All rights reserved.
+ * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
+ */
+
+#ifndef BX_CRTIMPL_H_HEADER_GUARD
+#define BX_CRTIMPL_H_HEADER_GUARD
+
+#if BX_CONFIG_ALLOCATOR_CRT
+#	include <malloc.h>
+#	include "allocator.h"
+#endif // BX_CONFIG_ALLOCATOR_CRT
+
+#if BX_CONFIG_CRT_FILE_READER_WRITER
+#	include "readerwriter.h"
+#endif // BX_CONFIG_CRT_FILE_READER_WRITER
+
+namespace bx
+{
+#if BX_CONFIG_ALLOCATOR_CRT
+	class CrtAllocator : public AllocatorI
+	{
+	public:
+		CrtAllocator()
+		{
+		}
+
+		virtual ~CrtAllocator()
+		{
+		}
+
+		virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) BX_OVERRIDE
+		{
+			if (0 == _size)
+			{
+				if (NULL != _ptr)
+				{
+					if (BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT >= _align)
+					{
+						::free(_ptr);
+						return NULL;
+					}
+
+#	if BX_COMPILER_MSVC
+					BX_UNUSED(_file, _line);
+					_aligned_free(_ptr);
+#	else
+					bx::alignedFree(this, _ptr, _align, _file, _line);
+#	endif // BX_
+				}
+
+				return NULL;
+			}
+			else if (NULL == _ptr)
+			{
+				if (BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT >= _align)
+				{
+					return ::malloc(_size);
+				}
+
+#	if BX_COMPILER_MSVC
+				BX_UNUSED(_file, _line);
+				return _aligned_malloc(_size, _align);
+#	else
+				return bx::alignedAlloc(this, _size, _align, _file, _line);
+#	endif // BX_
+			}
+
+			if (BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT >= _align)
+			{
+				return ::realloc(_ptr, _size);
+			}
+
+#	if BX_COMPILER_MSVC
+			BX_UNUSED(_file, _line);
+			return _aligned_realloc(_ptr, _size, _align);
+#	else
+			return bx::alignedRealloc(this, _ptr, _size, _align, _file, _line);
+#	endif // BX_
+		}
+	};
+#endif // BX_CONFIG_ALLOCATOR_CRT
+
+#if BX_CONFIG_CRT_FILE_READER_WRITER
+	class CrtFileReader : public FileReaderI
+	{
+	public:
+		CrtFileReader()
+			: m_file(NULL)
+		{
+		}
+
+		virtual ~CrtFileReader()
+		{
+		}
+
+		virtual bool open(const char* _filePath, Error* _err) BX_OVERRIDE
+		{
+			BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
+
+			m_file = fopen(_filePath, "rb");
+			if (NULL == m_file)
+			{
+				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_OPEN, "CrtFileReader: Failed to open file.");
+				return false;
+			}
+
+			return true;
+		}
+
+		virtual void close() BX_OVERRIDE
+		{
+			fclose(m_file);
+		}
+
+		virtual int64_t seek(int64_t _offset = 0, Whence::Enum _whence = Whence::Current) BX_OVERRIDE
+		{
+			fseeko64(m_file, _offset, _whence);
+			return ftello64(m_file);
+		}
+
+		virtual int32_t read(void* _data, int32_t _size, Error* _err) BX_OVERRIDE
+		{
+			BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
+
+			int32_t size = (int32_t)fread(_data, 1, _size, m_file);
+			if (size != _size)
+			{
+				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_READ, "CrtFileReader: read failed.");
+				return size >= 0 ? size : 0;
+			}
+
+			return size;
+		}
+
+	private:
+		FILE* m_file;
+	};
+
+	class CrtFileWriter : public FileWriterI
+	{
+	public:
+		CrtFileWriter()
+			: m_file(NULL)
+		{
+		}
+
+		virtual ~CrtFileWriter()
+		{
+		}
+
+		virtual bool open(const char* _filePath, bool _append, Error* _err) BX_OVERRIDE
+		{
+			m_file = fopen(_filePath, _append ? "ab" : "wb");
+
+			if (NULL == m_file)
+			{
+				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_OPEN, "CrtFileWriter: Failed to open file.");
+				return false;
+			}
+
+			return true;
+		}
+
+		virtual void close() BX_OVERRIDE
+		{
+			fclose(m_file);
+		}
+
+		virtual int64_t seek(int64_t _offset = 0, Whence::Enum _whence = Whence::Current) BX_OVERRIDE
+		{
+			fseeko64(m_file, _offset, _whence);
+			return ftello64(m_file);
+		}
+
+		virtual int32_t write(const void* _data, int32_t _size, Error* _err) BX_OVERRIDE
+		{
+			BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
+
+			int32_t size = (int32_t)fwrite(_data, 1, _size, m_file);
+			if (size != _size)
+			{
+				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_WRITE, "CrtFileWriter: write failed.");
+				return size >= 0 ? size : 0;
+			}
+
+			return size;
+		}
+
+	private:
+		FILE* m_file;
+	};
+#endif // BX_CONFIG_CRT_FILE_READER_WRITER
+
+} // namespace bx
+
+#endif // BX_CRTIMPL_H_HEADER_GUARD

include/bx/radixsort.h

@@ -14,7 +14,7 @@ namespace bx
 #define BX_RADIXSORT_HISTOGRAM_SIZE (1<<BX_RADIXSORT_BITS)
 #define BX_RADIXSORT_BIT_MASK (BX_RADIXSORT_HISTOGRAM_SIZE-1)
 
-	inline void radixSort32(uint32_t* __restrict _keys, uint32_t* __restrict _tempKeys, uint32_t _size)
+	inline void radixSort(uint32_t* __restrict _keys, uint32_t* __restrict _tempKeys, uint32_t _size)
 	{
 		uint32_t* __restrict keys = _keys;
 		uint32_t* __restrict tempKeys = _tempKeys;
@@ -76,7 +76,7 @@ done:
 	}
 
 	template <typename Ty>
-	inline void radixSort32(uint32_t* __restrict _keys, uint32_t* __restrict _tempKeys, Ty* __restrict _values, Ty* __restrict _tempValues, uint32_t _size)
+	inline void radixSort(uint32_t* __restrict _keys, uint32_t* __restrict _tempKeys, Ty* __restrict _values, Ty* __restrict _tempValues, uint32_t _size)
 	{
 		uint32_t* __restrict keys = _keys;
 		uint32_t* __restrict tempKeys = _tempKeys;
@@ -148,7 +148,7 @@ done:
 		}
 	}
 
-	inline void radixSort64(uint64_t* __restrict _keys, uint64_t* __restrict _tempKeys, uint32_t _size)
+	inline void radixSort(uint64_t* __restrict _keys, uint64_t* __restrict _tempKeys, uint32_t _size)
 	{
 		uint64_t* __restrict keys = _keys;
 		uint64_t* __restrict tempKeys = _tempKeys;
@@ -210,7 +210,7 @@ done:
 	}
 
 	template <typename Ty>
-	inline void radixSort64(uint64_t* __restrict _keys, uint64_t* __restrict _tempKeys, Ty* __restrict _values, Ty* __restrict _tempValues, uint32_t _size)
+	inline void radixSort(uint64_t* __restrict _keys, uint64_t* __restrict _tempKeys, Ty* __restrict _values, Ty* __restrict _tempValues, uint32_t _size)
 	{
 		uint64_t* __restrict keys = _keys;
 		uint64_t* __restrict tempKeys = _tempKeys;

include/bx/readerwriter.h

@@ -530,117 +530,6 @@ namespace bx
 		StaticMemoryBlock m_smb;
 	};
 
-#if BX_CONFIG_CRT_FILE_READER_WRITER
-	class CrtFileReader : public FileReaderI
-	{
-	public:
-		CrtFileReader()
-			: m_file(NULL)
-		{
-		}
-
-		virtual ~CrtFileReader()
-		{
-		}
-
-		virtual bool open(const char* _filePath, Error* _err) BX_OVERRIDE
-		{
-			BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
-
-			m_file = fopen(_filePath, "rb");
-			if (NULL == m_file)
-			{
-				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_OPEN, "CrtFileReader: Failed to open file.");
-				return false;
-			}
-
-			return true;
-		}
-
-		virtual void close() BX_OVERRIDE
-		{
-			fclose(m_file);
-		}
-
-		virtual int64_t seek(int64_t _offset = 0, Whence::Enum _whence = Whence::Current) BX_OVERRIDE
-		{
-			fseeko64(m_file, _offset, _whence);
-			return ftello64(m_file);
-		}
-
-		virtual int32_t read(void* _data, int32_t _size, Error* _err) BX_OVERRIDE
-		{
-			BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
-
-			int32_t size = (int32_t)fread(_data, 1, _size, m_file);
-			if (size != _size)
-			{
-				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_READ, "CrtFileReader: read failed.");
-				return size >= 0 ? size : 0;
-			}
-
-			return size;
-		}
-
-	private:
-		FILE* m_file;
-	};
-
-	class CrtFileWriter : public FileWriterI
-	{
-	public:
-		CrtFileWriter()
-			: m_file(NULL)
-		{
-		}
-
-		virtual ~CrtFileWriter()
-		{
-		}
-
-		virtual bool open(const char* _filePath, bool _append, Error* _err) BX_OVERRIDE
-		{
-			m_file = fopen(_filePath, _append ? "ab" : "wb");
-
-			if (NULL == m_file)
-			{
-				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_OPEN, "CrtFileWriter: Failed to open file.");
-				return false;
-			}
-
-			return true;
-		}
-
-		virtual void close() BX_OVERRIDE
-		{
-			fclose(m_file);
-		}
-
-		virtual int64_t seek(int64_t _offset = 0, Whence::Enum _whence = Whence::Current) BX_OVERRIDE
-		{
-			fseeko64(m_file, _offset, _whence);
-			return ftello64(m_file);
-		}
-
-		virtual int32_t write(const void* _data, int32_t _size, Error* _err) BX_OVERRIDE
-		{
-			BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
-
-			int32_t size = (int32_t)fwrite(_data, 1, _size, m_file);
-			if (size != _size)
-			{
-				BX_ERROR_SET(_err, BX_ERROR_READERWRITER_WRITE, "CrtFileWriter: write failed.");
-				return size >= 0 ? size : 0;
-			}
-
-			return size;
-		}
-
-	private:
-		FILE* m_file;
-	};
-#endif // BX_CONFIG_CRT_FILE_READER_WRITER
-
 } // namespace bx
 
 #endif // BX_READERWRITER_H_HEADER_GUARD