diff --git a/Modules/Core/Common/include/itkIndex.h b/Modules/Core/Common/include/itkIndex.h index 48e4175c780..754bc27dbdb 100644 --- a/Modules/Core/Common/include/itkIndex.h +++ b/Modules/Core/Common/include/itkIndex.h @@ -595,10 +595,6 @@ MakeIndex(const T... values) return Index{ { toValueType(values)... } }; } - -// static constexpr definition explicitly needed in C++11 -template -constexpr unsigned int Index::Dimension; } // end namespace itk #endif diff --git a/Modules/Core/Common/include/itkOffset.h b/Modules/Core/Common/include/itkOffset.h index 09c571316b1..694bfff02a3 100644 --- a/Modules/Core/Common/include/itkOffset.h +++ b/Modules/Core/Common/include/itkOffset.h @@ -526,10 +526,6 @@ swap(Offset & one, Offset & two) std::swap(one.m_InternalArray, two.m_InternalArray); } -// static constexpr definition explicitly needed in C++11 -template -constexpr unsigned int Offset::Dimension; - } // end namespace itk #endif diff --git a/Modules/Core/Common/include/itkSize.h b/Modules/Core/Common/include/itkSize.h index 63108f493ec..0b1ae89f451 100644 --- a/Modules/Core/Common/include/itkSize.h +++ b/Modules/Core/Common/include/itkSize.h @@ -496,11 +496,6 @@ MakeSize(const T... values) return Size{ { toValueType(values)... } }; } - -// static constexpr definition explicitly needed in C++11 -template -constexpr unsigned int Size::Dimension; - } // end namespace itk #endif diff --git a/Modules/Core/Common/src/itkNumericTraits.cxx b/Modules/Core/Common/src/itkNumericTraits.cxx index 69c48df8c94..550dad4a85a 100644 --- a/Modules/Core/Common/src/itkNumericTraits.cxx +++ b/Modules/Core/Common/src/itkNumericTraits.cxx @@ -27,57 +27,6 @@ namespace itk { -/* Add definition for static constexpr members - -Reason: You have to provide the definition of the static member as well as the -declaration. The declaration and the initializer go inside the class, -but the member definition has to be in a single separate compilation unit. -*/ -constexpr bool NumericTraits::Zero; -constexpr bool NumericTraits::One; - -constexpr unsigned char NumericTraits::Zero; -constexpr unsigned char NumericTraits::One; - -constexpr signed char NumericTraits::Zero; -constexpr signed char NumericTraits::One; - -constexpr char NumericTraits::Zero; -constexpr char NumericTraits::One; - -constexpr unsigned short NumericTraits::Zero; -constexpr unsigned short NumericTraits::One; - -constexpr short NumericTraits::Zero; -constexpr short NumericTraits::One; - -constexpr unsigned int NumericTraits::Zero; -constexpr unsigned int NumericTraits::One; - -constexpr int NumericTraits::Zero; -constexpr int NumericTraits::One; - -constexpr unsigned long NumericTraits::Zero; -constexpr unsigned long NumericTraits::One; - -constexpr long NumericTraits::Zero; -constexpr long NumericTraits::One; - -constexpr long long NumericTraits::Zero; -constexpr long long NumericTraits::One; - -constexpr unsigned long long NumericTraits::Zero; -constexpr unsigned long long NumericTraits::One; - -constexpr float NumericTraits::Zero; -constexpr float NumericTraits::One; - -constexpr double NumericTraits::Zero; -constexpr double NumericTraits::One; - -constexpr long double NumericTraits::Zero; -constexpr long double NumericTraits::One; - #if !defined(ITK_LEGACY_REMOVE) template <> const std::complex NumericTraits>::Zero = std::complex(0, 0); diff --git a/Modules/Numerics/FEM/src/itkFEMUtility.cxx b/Modules/Numerics/FEM/src/itkFEMUtility.cxx index 785539166cd..fd5d8d369d7 100644 --- a/Modules/Numerics/FEM/src/itkFEMUtility.cxx +++ b/Modules/Numerics/FEM/src/itkFEMUtility.cxx @@ -23,19 +23,6 @@ namespace itk namespace fem { -/* Add definition for static constexpr members - -Reason: You have to provide the definition of the static member as well as the -declaration. The declaration and the initializer go inside the class, -but the member definition has to be in a single separate compilation unit. -*/ - -constexpr double GaussIntegrate::zero; -constexpr double GaussIntegrate::one; -constexpr double GaussIntegrate::two; -constexpr double GaussIntegrate::z[110]; -constexpr double GaussIntegrate::w[110]; - /** * Numerical integration (Gauss-Legendre formula). * Integrates function f(x) from x=a to x=b in n points.