allocator: ensure only one non-lazy instance of allocate/deallocate exists

This fixes a bunch of link-time warnings with Apple Clang.

Signed-off-by: Steven Noonan <[email protected]>

Author: tycho

src/allocator.cpp

@@ -1,6 +1,9 @@
 // This file is part of meshoptimizer library; see meshoptimizer.h for version/license details
 #include "meshoptimizer.h"
 
+meshopt_alloc_t meshopt_Allocator::Storage::allocate = operator new;
+meshopt_dealloc_t meshopt_Allocator::Storage::deallocate = operator delete;
+
 void meshopt_setAllocator(void* (MESHOPTIMIZER_ALLOC_CALLCONV* allocate)(size_t), void (MESHOPTIMIZER_ALLOC_CALLCONV* deallocate)(void*))
 {
 	meshopt_Allocator::Storage::allocate = allocate;

src/meshoptimizer.h

@@ -813,18 +813,18 @@ inline int meshopt_quantizeSnorm(float v, int N)
 
 /* Internal implementation helpers */
 #ifdef __cplusplus
+typedef void* (MESHOPTIMIZER_ALLOC_CALLCONV *meshopt_alloc_t)(size_t);
+typedef void (MESHOPTIMIZER_ALLOC_CALLCONV *meshopt_dealloc_t)(void*);
+
 class meshopt_Allocator
 {
 public:
-	template <typename T>
-	struct StorageT
+	struct Storage
 	{
-		static void* (MESHOPTIMIZER_ALLOC_CALLCONV* allocate)(size_t);
-		static void (MESHOPTIMIZER_ALLOC_CALLCONV* deallocate)(void*);
+		static meshopt_alloc_t allocate;
+		static meshopt_dealloc_t deallocate;
 	};
 
-	typedef StorageT<void> Storage;
-
 	meshopt_Allocator()
 	    : blocks()
 	    , count(0)
@@ -857,12 +857,6 @@ class meshopt_Allocator
 	void* blocks[24];
 	size_t count;
 };
-
-// This makes sure that allocate/deallocate are lazily generated in translation units that need them and are deduplicated by the linker
-template <typename T>
-void* (MESHOPTIMIZER_ALLOC_CALLCONV* meshopt_Allocator::StorageT<T>::allocate)(size_t) = operator new;
-template <typename T>
-void (MESHOPTIMIZER_ALLOC_CALLCONV* meshopt_Allocator::StorageT<T>::deallocate)(void*) = operator delete;
 #endif
 
 /* Inline implementation for C++ templated wrappers */