diff --git a/src/vt/registry/auto/auto_registry_impl.h b/src/vt/registry/auto/auto_registry_impl.h index b72a1b4b36..975d112517 100644 --- a/src/vt/registry/auto/auto_registry_impl.h +++ b/src/vt/registry/auto/auto_registry_impl.h @@ -69,17 +69,20 @@ inline AutoHandlerType getAutoHandlerObjTypeIdx(HandlerType han) { template f> inline HandlerType makeAutoHandlerObjGroup(HandlerControlType ctrl) { - using AdapterT = FunctorAdapterMember< - objgroup::ActiveObjType, f, ObjT - >; + using AdapterT = + FunctorAdapterMember, f, ObjT>; using ContainerType = AutoActiveObjGroupContainerType; using RegInfoType = AutoRegInfoType; using FuncType = objgroup::ActiveObjAnyType; using RunType = RunnableGen; - auto const obj = true; + constexpr bool is_auto = true; + constexpr bool is_functor = false; + constexpr bool is_objgroup = true; auto const idx = RunType::idx; - auto const han = HandlerManagerType::makeHandler(true, false, idx, obj, ctrl); + auto const han = + HandlerManagerType::makeHandler(is_auto, is_functor, idx, is_objgroup, ctrl + ); auto obj_idx = objgroup::registry::makeObjIdx(); getAutoRegistryGen().at(idx).setObjIdx(obj_idx); return han; @@ -93,7 +96,9 @@ inline HandlerType makeAutoHandler() { using FuncType = ActiveFnPtrType; using RunType = RunnableGen; - return HandlerManagerType::makeHandler(true, false, RunType::idx); + constexpr bool is_auto = true; + constexpr bool is_functor = false; + return HandlerManagerType::makeHandler(is_auto, is_functor, RunType::idx); } template @@ -104,7 +109,9 @@ inline HandlerType makeAutoHandlerParam() { using FuncType = ActiveFnPtrType; using RunType = RunnableGen; - return HandlerManagerType::makeHandler(true, false, RunType::idx); + constexpr bool is_auto = true; + constexpr bool is_functor = false; + return HandlerManagerType::makeHandler(is_auto, is_functor, RunType::idx); } inline AutoActiveType getAutoHandler(HandlerType const& handler) { diff --git a/src/vt/registry/auto/functor/auto_registry_functor_impl.h b/src/vt/registry/auto/functor/auto_registry_functor_impl.h index ecc2a2668a..a3109104e0 100644 --- a/src/vt/registry/auto/functor/auto_registry_functor_impl.h +++ b/src/vt/registry/auto/functor/auto_registry_functor_impl.h @@ -62,10 +62,12 @@ inline HandlerType makeAutoHandlerFunctor() { using ContainerType = AutoActiveFunctorContainerType; using RegInfoType = AutoRegInfoType; using FuncType = ActiveFnPtrType; - using RunType = RunnableFunctor< - AdapterType, ContainerType, RegInfoType, FuncType, msg - >; - return HandlerManagerType::makeHandler(true, true, RunType::idx); + using RunType = + RunnableFunctor; + + constexpr bool is_auto = true; + constexpr bool is_functor = true; + return HandlerManagerType::makeHandler(is_auto, is_functor, RunType::idx); } template diff --git a/src/vt/registry/auto/map/auto_registry_map_impl.h b/src/vt/registry/auto/map/auto_registry_map_impl.h index 0f332e7009..e73dd6637d 100644 --- a/src/vt/registry/auto/map/auto_registry_map_impl.h +++ b/src/vt/registry/auto/map/auto_registry_map_impl.h @@ -71,11 +71,12 @@ inline HandlerType makeAutoHandlerFunctorMap() { using RunnableT = RunnableFunctor< FunctorT, ContainerType, RegInfoType, FuncType, true, Args... >; - auto const& han = HandlerManagerType::makeHandler(true, true, RunnableT::idx); - vt_debug_print( - handler, node, - "makeAutoHandlerFunctorMap: handler={}\n", han - ); + + constexpr bool is_auto = true; + constexpr bool is_functor = true; + auto const han = + HandlerManagerType::makeHandler(is_auto, is_functor, RunnableT::idx); + vt_debug_print(handler, node, "makeAutoHandlerFunctorMap: handler={}\n", han); return han; } @@ -110,12 +111,12 @@ inline HandlerType makeAutoHandlerMap() { using ContainerType = AutoActiveMapContainerType; using RegInfoType = AutoRegInfoType; using FuncType = ActiveMapFnPtrType; + + constexpr bool is_auto = true; + constexpr bool is_functor = false; auto id = RunnableGen::idx; - auto const& han = HandlerManagerType::makeHandler(true,false,id); - vt_debug_print( - handler, node, - "makeAutoHandlerMap: id={}, han={}\n", id, han - ); + auto const han = HandlerManagerType::makeHandler(is_auto, is_functor, id); + vt_debug_print(handler, node, "makeAutoHandlerMap: id={}, han={}\n", id, han); return han; } @@ -135,8 +136,11 @@ inline HandlerType makeAutoHandlerSeedMap() { using ContainerType = AutoActiveSeedMapContainerType; using RegInfoType = AutoRegInfoType; using FuncType = ActiveSeedMapFnPtrType; + + constexpr bool is_auto = true; + constexpr bool is_functor = false; auto id = RunnableGen::idx; - auto const& han = HandlerManagerType::makeHandler(true, false, id); + auto const han = HandlerManagerType::makeHandler(is_auto, is_functor, id); vt_debug_print(handler, node, "makeAutoHandlerMap: id={}, han={}\n", id, han); return han; }