Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Modules/Core/Common/include/itkSingleton.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ class ITKCommon_EXPORT SingletonIndex
public:
/** Standard class types. */
using Self = SingletonIndex;
using SingletonData =
std::map<std::string, std::tuple<void *, std::function<void(void *)>, std::function<void(void)>>>;
using SingletonData = std::map<std::string, std::tuple<void *, std::function<void(void *)>, std::function<void()>>>;

// obtain a global registered in the singleton index under the
// globalName, if unknown then nullptr will be returned.
Expand All @@ -69,7 +68,7 @@ class ITKCommon_EXPORT SingletonIndex
SetGlobalInstance(const char * globalName,
T * global,
std::function<void(void *)> func,
std::function<void(void)> deleteFunc)
std::function<void()> deleteFunc)
{
return this->SetGlobalInstancePrivate(globalName, global, func, deleteFunc);
}
Expand Down Expand Up @@ -97,7 +96,7 @@ class ITKCommon_EXPORT SingletonIndex
SetGlobalInstancePrivate(const char * globalName,
void * global,
std::function<void(void *)> func,
std::function<void(void)> deleteFunc);
std::function<void()> deleteFunc);

/** The static GlobalSingleton. This is initialized to nullptr as the first
* stage of static initialization. It is then populated on the first call to
Expand All @@ -112,7 +111,7 @@ class ITKCommon_EXPORT SingletonIndex
// A wrapper for a global variable registered in the singleton index.
template <typename T>
T *
Singleton(const char * globalName, std::function<void(void *)> func, std::function<void(void)> deleteFunc)
Singleton(const char * globalName, std::function<void(void *)> func, std::function<void()> deleteFunc)
{
static SingletonIndex * singletonIndex = SingletonIndex::GetInstance();
Unused(singletonIndex);
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkSingleton.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ bool
SingletonIndex::SetGlobalInstancePrivate(const char * globalName,
void * global,
std::function<void(void *)> func,
std::function<void(void)> deleteFunc)
std::function<void()> deleteFunc)
{
m_GlobalObjects.erase(globalName);
m_GlobalObjects.insert(std::make_pair(globalName, std::make_tuple(global, func, deleteFunc)));
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/src/itkStreamingProcessObject.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ StreamingProcessObject::ResetPipeline()
}


StreamingProcessObject::StreamingProcessObject(void) = default;
StreamingProcessObject::StreamingProcessObject() = default;


StreamingProcessObject::~StreamingProcessObject() = default;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Filtering/FFT/include/itkInverse1DFFTImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT Inverse1DFFTImageFilter : public ImageToImageFilter<TI
* Default implementation is VnlFFT1D.
*/
static Pointer
New(void);
New();

/** Get the direction in which the filter is to be applied. */
itkGetConstMacro(Direction, unsigned int);
Expand Down
2 changes: 1 addition & 1 deletion Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ SPSAOptimizer::GetValue(const ParametersType & parameters) const
{
/**
* This method just calls the Superclass' implementation,
* but is necessary because GetValue(void) is also declared
* but is necessary because GetValue() is also declared
* in this class.
*/
return this->Superclass::GetValue(parameters);
Expand Down