move TaskSpaceDeleter & ItemControlBlockDeleter definitions to place …

…where TaskSpace & ItemControlBlock are complete types
ComputationalRadiationPhysics · Feb 1, 2024 · cb37cf7 · cb37cf7
1 parent 3f18e5c
commit cb37cf7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/redGrapes/task/task_space.cpp b/redGrapes/task/task_space.cpp
@@ -16,6 +16,11 @@
 
 namespace redGrapes
 {
+    void TaskSpaceDeleter::operator()(TaskSpace* s)
+    {
+        delete s;
+    }
+
     TaskSpace::~TaskSpace()
     {
     }

diff --git a/redGrapes/task/task_space.hpp b/redGrapes/task/task_space.hpp
@@ -25,10 +25,7 @@ namespace redGrapes
 
     struct TaskSpaceDeleter
     {
-        void operator()(TaskSpace* space)
-        {
-            delete space;
-        }
+        void operator()(TaskSpace* space);
     };
 
     /*! TaskSpace handles sub-taskspaces of child tasks

diff --git a/redGrapes/util/atomic_list.hpp b/redGrapes/util/atomic_list.hpp
@@ -48,13 +48,7 @@ namespace redGrapes
 
             struct ItemControlBlockDeleter
             {
-                void operator()(ItemControlBlock* e)
-                {
-                    auto alloc = e->alloc;
-                    e->~ItemControlBlock();
-                    memory::Block blk{(uintptr_t) e, sizeof(ItemControlBlock) + sizeof(Item)};
-                    alloc.deallocate(blk);
-                }
+                void operator()(ItemControlBlock*);
             };
 
             struct ItemControlBlock : Refcounted<ItemControlBlock, ItemControlBlockDeleter>
@@ -295,6 +289,16 @@ namespace redGrapes
             }
         };
 
+        template<typename Item, typename Allocator>
+        void AtomicList<Item, Allocator>::ItemControlBlockDeleter::operator()(
+            AtomicList<Item, Allocator>::ItemControlBlock* e)
+        {
+            Allocator alloc = e->alloc;
+            e->~ItemControlBlock();
+            memory::Block blk{(uintptr_t) e, 0};
+            alloc.deallocate(blk);
+        }
+
     } // namespace memory
 
 } // namespace redGrapes