STYLE: Declare lambda's created for Singleton const, but non-static

N-Dekker · dzenanz · commit 2d19f26bb766 · 2022-09-23T09:02:34.000-04:00
The lifetime of lambda's passed as argument to the function `Singleton&lt;T&gt;` does
not need to be extended beyond the function call, as these arguments directly
get converted to `std::function` objects.
diff --git a/Modules/Core/Common/include/itkSingletonMacro.h b/Modules/Core/Common/include/itkSingletonMacro.h
@@ -44,11 +44,11 @@
   {                                                                                                 \
     if (m_##VarName == nullptr)                                                                     \
     {                                                                                               \
-      static auto setLambda = [](void * a) {                                                        \
+      const auto setLambda = [](void * a) {                                                         \
         delete m_##VarName;                                                                         \
         m_##VarName = static_cast<Type *>(a);                                                       \
       };                                                                                            \
-      static auto deleteLambda = []() {                                                             \
+      const auto deleteLambda = []() {                                                              \
         delete m_##VarName;                                                                         \
         m_##VarName = nullptr;                                                                      \
       };                                                                                            \
diff --git a/Modules/Core/Common/src/itkObjectFactoryBase.cxx b/Modules/Core/Common/src/itkObjectFactoryBase.cxx
@@ -117,7 +117,7 @@ class ObjectFactoryBasePrivate : public LightObject
 ObjectFactoryBasePrivate *
 ObjectFactoryBase::GetPimplGlobalsPointer()
 {
-  static auto                deleteLambda = []() { m_PimplGlobals->UnRegister(); };
+  const auto                 deleteLambda = []() { m_PimplGlobals->UnRegister(); };
   ObjectFactoryBasePrivate * globalInstance =
     Singleton<ObjectFactoryBasePrivate>("ObjectFactoryBase", SynchronizeObjectFactoryBase, deleteLambda);
   if (globalInstance != m_PimplGlobals)

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ class ObjectFactoryBasePrivate : public LightObject`
`117`	`117`	`ObjectFactoryBasePrivate *`
`118`	`118`	`ObjectFactoryBase::GetPimplGlobalsPointer()`
`119`	`119`	`{`
`120`		`- static auto deleteLambda = []() { m_PimplGlobals->UnRegister(); };`
	`120`	`+ const auto deleteLambda = []() { m_PimplGlobals->UnRegister(); };`
`121`	`121`	`ObjectFactoryBasePrivate * globalInstance =`
`122`	`122`	`Singleton<ObjectFactoryBasePrivate>("ObjectFactoryBase", SynchronizeObjectFactoryBase, deleteLambda);`
`123`	`123`	`if (globalInstance != m_PimplGlobals)`