diff options
| author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2021-09-30 15:12:08 +0300 |
|---|---|---|
| committer | Hans-Kristian Arntzen <post@arntzen-software.no> | 2021-09-30 15:12:08 +0300 |
| commit | 96d95fbb3185b98177c0f447d2e73e8e18dfd7b8 (patch) | |
| tree | 5e1793ff83a06371b7a65565f725b0331adbd846 /spirv_cross_containers.hpp | |
| parent | 9462b90067f60c8dcd406e1dcfdd15a206ddba5f (diff) | |
MSVC: Workaround crtdbg macroing free().
Diffstat (limited to 'spirv_cross_containers.hpp')
| -rw-r--r-- | spirv_cross_containers.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spirv_cross_containers.hpp b/spirv_cross_containers.hpp index f2179b4e..a027250b 100644 --- a/spirv_cross_containers.hpp +++ b/spirv_cross_containers.hpp @@ -546,7 +546,7 @@ class ObjectPoolBase { public: virtual ~ObjectPoolBase() = default; - virtual void free_opaque(void *ptr) = 0; + virtual void deallocate_opaque(void *ptr) = 0; }; template <typename T> @@ -580,15 +580,15 @@ public: return ptr; } - void free(T *ptr) + void deallocate(T *ptr) { ptr->~T(); vacants.push_back(ptr); } - void free_opaque(void *ptr) override + void deallocate_opaque(void *ptr) override { - free(static_cast<T *>(ptr)); + deallocate(static_cast<T *>(ptr)); } void clear() |