Use splicer to work around bool template param issue

Author: davidbeckingsale

src/umpire/interface/umpire_shroud.yaml

@@ -261,48 +261,48 @@ declarations:
               template_suffix: _prefetcher
               function_suffix: ""
 
-      - decl: template <typename T, bool B> Allocator makeAllocator(const std::string& name, Allocator allocator, size_t initial_size, size_t block);
-        options:
-          F_create_generic: False
-        cxx_template:
-        - instantiation: <umpire::strategy::DynamicPoolList, false>
-          format:
-            template_suffix: _list_pool_untracked
-            function_suffix: ""
-        - instantiation: <umpire::strategy::QuickPool, false>
-          format:
-            template_suffix: _quick_pool_untracked
-            function_suffix: ""
-        - instantiation: <umpire::strategy::ResourceAwarePool, false>
-          format:
-            template_suffix: _resource_aware_pool_untracked
-            function_suffix: ""
+      # Untracked pool allocators - using splicer to handle bool template parameter
+      - decl: Allocator makeAllocator_list_pool_untracked(const std::string& name, Allocator allocator, size_t initial_size, size_t block)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::DynamicPoolList, false>(name, *SHCXX_allocator, initial_size, block);
 
-      - decl: template <typename T, bool B> Allocator makeAllocator(const std::string& name, Allocator allocator, size_t object_size);
-        options:
-          F_create_generic: False
-        cxx_template:
-          - instantiation: <umpire::strategy::FixedPool, false>
-            format:
-              template_suffix: _fixed_pool_untracked
-              function_suffix: ""
-          - instantiation: <umpire::strategy::MonotonicAllocationStrategy, false>
-            format:
-              template_suffix: _monotonic_untracked
-              function_suffix: ""
-          - instantiation: <umpire::strategy::SlotPool, false>
-            format:
-              template_suffix: _slot_pool_untracked
-              function_suffix: ""
+      - decl: Allocator makeAllocator_quick_pool_untracked(const std::string& name, Allocator allocator, size_t initial_size, size_t block)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::QuickPool, false>(name, *SHCXX_allocator, initial_size, block);
 
-      - decl: template <typename T, bool B> Allocator makeAllocator(const std::string& name, Allocator allocator, size_t smallest_fixed_obj_size, size_t largest_fixed_obj_size, size_t max_initial_fixed_pool_size, size_t fixed_size_multiplier, size_t quick_pool_initial_alloc_size, size_t quick_pool_min_alloc_size, size_t quick_pool_align_bytes);
-        options:
-          F_create_generic: False
-        cxx_template:
-          - instantiation: <umpire::strategy::MixedPool, false>
-            format:
-              template_suffix: _mixed_pool_untracked
-              function_suffix: ""
+      - decl: Allocator makeAllocator_resource_aware_pool_untracked(const std::string& name, Allocator allocator, size_t initial_size, size_t block)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::ResourceAwarePool, false>(name, *SHCXX_allocator, initial_size, block);
+
+      - decl: Allocator makeAllocator_fixed_pool_untracked(const std::string& name, Allocator allocator, size_t object_size)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::FixedPool, false>(name, *SHCXX_allocator, object_size);
+
+      - decl: Allocator makeAllocator_monotonic_untracked(const std::string& name, Allocator allocator, size_t object_size)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::MonotonicAllocationStrategy, false>(name, *SHCXX_allocator, object_size);
+
+      - decl: Allocator makeAllocator_slot_pool_untracked(const std::string& name, Allocator allocator, size_t object_size)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::SlotPool, false>(name, *SHCXX_allocator, object_size);
+
+      - decl: Allocator makeAllocator_mixed_pool_untracked(const std::string& name, Allocator allocator, size_t smallest_fixed_obj_size, size_t largest_fixed_obj_size, size_t max_initial_fixed_pool_size, size_t fixed_size_multiplier, size_t quick_pool_initial_alloc_size, size_t quick_pool_min_alloc_size, size_t quick_pool_align_bytes)
+        splicer:
+          c: |
+            umpire::Allocator *SHCXX_allocator = static_cast<umpire::Allocator *>(allocator.addr);
+            SHCXX_rv = SH_this->makeAllocator<umpire::strategy::MixedPool, false>(name, *SHCXX_allocator, smallest_fixed_obj_size, largest_fixed_obj_size, max_initial_fixed_pool_size, fixed_size_multiplier, quick_pool_initial_alloc_size, quick_pool_min_alloc_size, quick_pool_align_bytes);
 
       - decl: void addAlias(const std::string& name, Allocator allocator)
       - decl: void removeAlias(const std::string& name, Allocator allocator)