From be1269b22540a7f8788165f2d9492583a00798eb Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Mon, 16 Jun 2025 17:04:30 -0500 Subject: [PATCH] STYLE: Use C++17 nested namespace syntax Replace nested namespaces such as 'namespace a { namespace b { ... } }' and changes to the more concise syntax introduced in C++17: 'namespace a::b { ... }'. Inline namespaces are not modified. Disabled KWStyle Namespace checking that is incapable of supporting the c++17 nested namespace formatting. --- .../Common/include/itkBinaryOperationConcept.h | 11 +++-------- Modules/Core/Common/include/itkConceptChecking.h | 8 +++----- .../include/itkExtractImageFilterRegionCopier.h | 7 ++----- .../Common/include/itkImageToImageFilterDetail.h | 8 +++----- Modules/Core/Common/include/itkIsNumber.h | 8 +++----- .../Core/Common/include/itkLexicographicCompare.h | 7 ++----- Modules/Core/Common/include/itkMath.h | 8 ++------ Modules/Core/Common/include/itkMathDetail.h | 9 ++++----- .../itkMersenneTwisterRandomVariateGenerator.h | 7 ++----- .../Core/Common/include/itkMetaDataObjectDetail.h | 8 +++----- .../Core/Common/include/itkNeighborhoodAlgorithm.h | 7 ++----- .../Common/include/itkNeighborhoodAlgorithm.hxx | 7 ++----- Modules/Core/Common/include/itkPrintHelper.h | 8 ++------ Modules/Core/Common/include/itkPromoteType.h | 8 +++----- .../Common/include/itkRandomVariateGeneratorBase.h | 7 ++----- Modules/Core/Common/src/itkMath.cxx | 7 ++----- .../itkMersenneTwisterRandomVariateGenerator.cxx | 7 ++----- .../Common/src/itkRandomVariateGeneratorBase.cxx | 7 ++----- Modules/Core/Common/test/itkLogTester.h | 8 +++----- Modules/Core/Common/test/itkPromoteType.cxx | 8 +++----- .../ImageAdaptors/include/itkAddPixelAccessor.h | 7 ++----- .../include/itkRGBToVectorPixelAccessor.h | 7 ++----- .../include/itkVectorToRGBPixelAccessor.h | 7 ++----- Modules/Core/TestKernel/include/itkGTest.h | 7 ++----- .../Core/TestKernel/include/itkGTestPredicate.h | 13 +++---------- .../include/itkGTestTypedefsAndConstructors.h | 14 +++----------- .../include/itkTestingComparisonImageFilter.h | 7 ++----- .../include/itkTestingComparisonImageFilter.hxx | 7 ++----- .../include/itkTestingExtractSliceImageFilter.h | 7 ++----- .../include/itkTestingExtractSliceImageFilter.hxx | 7 ++----- .../TestKernel/include/itkTestingHashImageFilter.h | 7 ++----- .../include/itkTestingHashImageFilter.hxx | 7 ++----- .../itkTestingStretchIntensityImageFilter.h | 7 ++----- .../itkTestingStretchIntensityImageFilter.hxx | 7 ++----- .../src/itkTestingExtractSliceImageFilter.cxx | 7 ++----- .../TestKernel/src/itkTestingHashImageFilter.cxx | 7 ++----- .../Core/Transform/include/itkv3Rigid3DTransform.h | 8 +++----- Modules/Core/Transform/test/itkTransformTest.cxx | 8 +++----- .../Colormap/include/itkAutumnColormapFunction.h | 7 ++----- .../Colormap/include/itkAutumnColormapFunction.hxx | 8 ++------ .../Colormap/include/itkBlueColormapFunction.h | 7 ++----- .../Colormap/include/itkBlueColormapFunction.hxx | 8 ++------ .../Colormap/include/itkColormapFunction.h | 7 ++----- .../Colormap/include/itkCoolColormapFunction.h | 7 ++----- .../Colormap/include/itkCoolColormapFunction.hxx | 8 ++------ .../Colormap/include/itkCopperColormapFunction.h | 7 ++----- .../Colormap/include/itkCopperColormapFunction.hxx | 8 ++------ .../Colormap/include/itkCustomColormapFunction.h | 7 ++----- .../Colormap/include/itkCustomColormapFunction.hxx | 8 ++------ .../Colormap/include/itkGreenColormapFunction.h | 7 ++----- .../Colormap/include/itkGreenColormapFunction.hxx | 8 ++------ .../Colormap/include/itkGreyColormapFunction.h | 7 ++----- .../Colormap/include/itkGreyColormapFunction.hxx | 8 ++------ .../Colormap/include/itkHSVColormapFunction.h | 7 ++----- .../Colormap/include/itkHSVColormapFunction.hxx | 8 ++------ .../Colormap/include/itkHotColormapFunction.h | 7 ++----- .../Colormap/include/itkHotColormapFunction.hxx | 8 ++------ .../Colormap/include/itkJetColormapFunction.h | 7 ++----- .../Colormap/include/itkJetColormapFunction.hxx | 8 ++------ .../include/itkOverUnderColormapFunction.h | 7 ++----- .../include/itkOverUnderColormapFunction.hxx | 8 ++------ .../Colormap/include/itkRedColormapFunction.h | 7 ++----- .../Colormap/include/itkRedColormapFunction.hxx | 8 ++------ .../Colormap/include/itkSpringColormapFunction.h | 7 ++----- .../Colormap/include/itkSpringColormapFunction.hxx | 8 ++------ .../Colormap/include/itkSummerColormapFunction.h | 7 ++----- .../Colormap/include/itkSummerColormapFunction.hxx | 8 ++------ .../Colormap/include/itkWinterColormapFunction.h | 7 ++----- .../Colormap/include/itkWinterColormapFunction.hxx | 8 ++------ .../test/itkCustomColormapFunctionTest.cxx | 8 ++------ .../itkSignedDanielssonDistanceMapImageFilter.h | 8 +++----- .../Filtering/FFT/include/itkFFTWCommonExtended.h | 9 +++------ .../ImageFusion/include/itkLabelOverlayFunctor.h | 7 ++----- .../ImageFusion/include/itkLabelToRGBFunctor.h | 7 ++----- .../include/itkScalarToRGBPixelFunctor.h | 7 ++----- .../include/itkScalarToRGBPixelFunctor.hxx | 7 ++----- .../include/itkArithmeticOpsFunctors.h | 8 +++----- .../ImageIntensity/include/itkBitwiseOpsFunctors.h | 7 ++----- .../ImageIntensity/include/itkLogicOpsFunctors.h | 9 +++------ .../src/itkSymmetricEigenAnalysisImageFilter.cxx | 7 ++----- .../include/itkAdaptiveEqualizationHistogram.h | 8 +++----- .../test/itkProjectionImageFilterTest.cxx | 11 +++-------- .../LabelMap/include/itkLabelObjectAccessors.h | 7 ++----- .../include/itkLabelObjectLineComparator.h | 7 ++----- .../include/itkShapeLabelObjectAccessors.h | 7 ++----- .../include/itkStatisticsLabelObjectAccessors.h | 7 ++----- .../include/itkMorphologyHistogram.h | 7 ++----- .../include/itkRankHistogram.h | 7 ++----- .../include/itkInternationalizationIOHelpers.h | 8 +++----- Modules/IO/MeshBase/include/itkMeshIOTestHelper.h | 8 +++----- .../Numerics/FEM/include/itkFEMElement1DStress.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement1DStress.hxx | 7 ++----- .../FEM/include/itkFEMElement2DC0LinearLine.h | 7 ++----- .../include/itkFEMElement2DC0LinearLineStress.h | 7 ++----- .../include/itkFEMElement2DC0LinearQuadrilateral.h | 7 ++----- .../itkFEMElement2DC0LinearQuadrilateralMembrane.h | 7 ++----- .../itkFEMElement2DC0LinearQuadrilateralStrain.h | 7 ++----- .../itkFEMElement2DC0LinearQuadrilateralStress.h | 7 ++----- .../include/itkFEMElement2DC0LinearTriangular.h | 7 ++----- .../itkFEMElement2DC0LinearTriangularMembrane.h | 7 ++----- .../itkFEMElement2DC0LinearTriangularStrain.h | 7 ++----- .../itkFEMElement2DC0LinearTriangularStress.h | 7 ++----- .../include/itkFEMElement2DC0QuadraticTriangular.h | 7 ++----- .../itkFEMElement2DC0QuadraticTriangularStrain.h | 7 ++----- .../itkFEMElement2DC0QuadraticTriangularStress.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement2DC1Beam.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement2DMembrane.h | 7 ++----- .../FEM/include/itkFEMElement2DMembrane.hxx | 8 ++------ .../Numerics/FEM/include/itkFEMElement2DStrain.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement2DStrain.hxx | 8 ++------ .../Numerics/FEM/include/itkFEMElement2DStress.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement2DStress.hxx | 8 ++------ .../include/itkFEMElement3DC0LinearHexahedron.h | 7 ++----- .../itkFEMElement3DC0LinearHexahedronMembrane.h | 7 ++----- .../itkFEMElement3DC0LinearHexahedronStrain.h | 7 ++----- .../include/itkFEMElement3DC0LinearTetrahedron.h | 7 ++----- .../itkFEMElement3DC0LinearTetrahedronMembrane.h | 7 ++----- .../itkFEMElement3DC0LinearTetrahedronStrain.h | 7 ++----- .../include/itkFEMElement3DC0LinearTriangular.h | 7 ++----- ...FEMElement3DC0LinearTriangularLaplaceBeltrami.h | 7 ++----- .../itkFEMElement3DC0LinearTriangularMembrane.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement3DMembrane.h | 7 ++----- .../FEM/include/itkFEMElement3DMembrane.hxx | 8 ++------ .../FEM/include/itkFEMElement3DMembrane1DOF.h | 7 ++----- .../FEM/include/itkFEMElement3DMembrane1DOF.hxx | 8 ++------ .../Numerics/FEM/include/itkFEMElement3DStrain.h | 7 ++----- .../Numerics/FEM/include/itkFEMElement3DStrain.hxx | 8 ++------ Modules/Numerics/FEM/include/itkFEMElementBase.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMElementStd.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMElementStd.hxx | 8 ++------ Modules/Numerics/FEM/include/itkFEMException.h | 7 ++----- .../Numerics/FEM/include/itkFEMImageMetricLoad.h | 7 ++----- .../Numerics/FEM/include/itkFEMImageMetricLoad.hxx | 8 ++------ .../FEM/include/itkFEMItpackSparseMatrix.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLightObject.h | 7 ++----- .../FEM/include/itkFEMLinearSystemWrapper.h | 7 ++----- .../include/itkFEMLinearSystemWrapperDenseVNL.h | 7 ++----- .../FEM/include/itkFEMLinearSystemWrapperItpack.h | 7 ++----- .../FEM/include/itkFEMLinearSystemWrapperVNL.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadBC.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadBCMFC.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadBase.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadEdge.h | 7 ++----- .../Numerics/FEM/include/itkFEMLoadElementBase.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadGrav.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadLandmark.h | 8 +++----- Modules/Numerics/FEM/include/itkFEMLoadNode.h | 7 ++----- .../Numerics/FEM/include/itkFEMLoadNoisyLandmark.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadPoint.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMLoadTest.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMMaterialBase.h | 7 ++----- .../FEM/include/itkFEMMaterialLinearElasticity.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMObject.h | 8 +++----- Modules/Numerics/FEM/include/itkFEMObject.hxx | 7 ++----- Modules/Numerics/FEM/include/itkFEMP.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMPArray.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMRobustSolver.h | 7 ++----- .../Numerics/FEM/include/itkFEMRobustSolver.hxx | 7 ++----- .../itkFEMScatteredDataPointSetToImageFilter.h | 7 ++----- .../itkFEMScatteredDataPointSetToImageFilter.hxx | 7 ++----- Modules/Numerics/FEM/include/itkFEMSolution.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMSolver.h | 7 ++----- Modules/Numerics/FEM/include/itkFEMSolver.hxx | 7 ++----- .../FEM/include/itkFEMSolverCrankNicolson.h | 7 ++----- .../FEM/include/itkFEMSolverCrankNicolson.hxx | 7 ++----- .../Numerics/FEM/include/itkFEMSolverHyperbolic.h | 7 ++----- .../FEM/include/itkFEMSolverHyperbolic.hxx | 7 ++----- Modules/Numerics/FEM/include/itkFEMUtility.h | 7 ++----- .../include/itkImageToRectilinearFEMObjectFilter.h | 7 ++----- .../itkImageToRectilinearFEMObjectFilter.hxx | 8 +++----- .../FEM/src/itkFEMElement2DC0LinearLine.cxx | 7 ++----- .../FEM/src/itkFEMElement2DC0LinearLineStress.cxx | 7 ++----- .../src/itkFEMElement2DC0LinearQuadrilateral.cxx | 7 ++----- ...tkFEMElement2DC0LinearQuadrilateralMembrane.cxx | 7 ++----- .../itkFEMElement2DC0LinearQuadrilateralStrain.cxx | 7 ++----- .../itkFEMElement2DC0LinearQuadrilateralStress.cxx | 7 ++----- .../FEM/src/itkFEMElement2DC0LinearTriangular.cxx | 7 ++----- .../itkFEMElement2DC0LinearTriangularMembrane.cxx | 7 ++----- .../itkFEMElement2DC0LinearTriangularStrain.cxx | 7 ++----- .../itkFEMElement2DC0LinearTriangularStress.cxx | 7 ++----- .../src/itkFEMElement2DC0QuadraticTriangular.cxx | 7 ++----- .../itkFEMElement2DC0QuadraticTriangularStrain.cxx | 7 ++----- .../itkFEMElement2DC0QuadraticTriangularStress.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMElement2DC1Beam.cxx | 7 ++----- .../FEM/src/itkFEMElement3DC0LinearHexahedron.cxx | 7 ++----- .../itkFEMElement3DC0LinearHexahedronMembrane.cxx | 7 ++----- .../itkFEMElement3DC0LinearHexahedronStrain.cxx | 7 ++----- .../FEM/src/itkFEMElement3DC0LinearTetrahedron.cxx | 7 ++----- .../itkFEMElement3DC0LinearTetrahedronMembrane.cxx | 7 ++----- .../itkFEMElement3DC0LinearTetrahedronStrain.cxx | 7 ++----- .../FEM/src/itkFEMElement3DC0LinearTriangular.cxx | 7 ++----- ...MElement3DC0LinearTriangularLaplaceBeltrami.cxx | 7 ++----- .../itkFEMElement3DC0LinearTriangularMembrane.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMElementBase.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMException.cxx | 7 ++----- .../Numerics/FEM/src/itkFEMItpackSparseMatrix.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLightObject.cxx | 7 ++----- .../Numerics/FEM/src/itkFEMLinearSystemWrapper.cxx | 7 ++----- .../FEM/src/itkFEMLinearSystemWrapperDenseVNL.cxx | 7 ++----- .../FEM/src/itkFEMLinearSystemWrapperItpack.cxx | 7 ++----- .../FEM/src/itkFEMLinearSystemWrapperVNL.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadBC.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadBCMFC.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadBase.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadEdge.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadElementBase.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadGrav.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadLandmark.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadNode.cxx | 7 ++----- .../Numerics/FEM/src/itkFEMLoadNoisyLandmark.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMLoadPoint.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMMaterialBase.cxx | 7 ++----- .../FEM/src/itkFEMMaterialLinearElasticity.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMSolution.cxx | 7 ++----- Modules/Numerics/FEM/src/itkFEMUtility.cxx | 7 ++----- .../include/itkConvergenceMonitoringFunction.h | 7 ++----- .../itkWindowConvergenceMonitoringFunction.h | 7 ++----- .../itkWindowConvergenceMonitoringFunction.hxx | 7 ++----- .../Statistics/include/itkChiSquareDistribution.h | 7 ++----- .../Statistics/include/itkCovarianceSampleFilter.h | 7 ++----- .../include/itkCovarianceSampleFilter.hxx | 7 ++----- .../Numerics/Statistics/include/itkDecisionRule.h | 7 ++----- .../include/itkDenseFrequencyContainer2.h | 7 ++----- .../Statistics/include/itkDistanceMetric.h | 7 ++----- .../Statistics/include/itkDistanceMetric.hxx | 8 ++------ .../itkDistanceToCentroidMembershipFunction.h | 7 ++----- .../itkDistanceToCentroidMembershipFunction.hxx | 7 ++----- .../include/itkEuclideanDistanceMetric.h | 7 ++----- .../include/itkEuclideanDistanceMetric.hxx | 8 ++------ .../include/itkEuclideanSquareDistanceMetric.h | 7 ++----- .../include/itkEuclideanSquareDistanceMetric.hxx | 8 ++------ ...kExpectationMaximizationMixtureModelEstimator.h | 7 ++----- ...xpectationMaximizationMixtureModelEstimator.hxx | 7 ++----- .../Statistics/include/itkGaussianDistribution.h | 7 ++----- .../include/itkGaussianMembershipFunction.h | 7 ++----- .../include/itkGaussianMembershipFunction.hxx | 8 ++------ .../include/itkGaussianMixtureModelComponent.h | 7 ++----- .../include/itkGaussianMixtureModelComponent.hxx | 7 ++----- .../itkGaussianRandomSpatialNeighborSubsampler.h | 7 ++----- .../itkGaussianRandomSpatialNeighborSubsampler.hxx | 7 ++----- Modules/Numerics/Statistics/include/itkHistogram.h | 7 ++----- .../Numerics/Statistics/include/itkHistogram.hxx | 7 ++----- .../itkHistogramToRunLengthFeaturesFilter.h | 7 ++----- .../itkHistogramToRunLengthFeaturesFilter.hxx | 7 ++----- .../include/itkHistogramToTextureFeaturesFilter.h | 7 ++----- .../itkHistogramToTextureFeaturesFilter.hxx | 7 ++----- .../Statistics/include/itkImageClassifierFilter.h | 7 ++----- .../include/itkImageClassifierFilter.hxx | 7 ++----- .../Statistics/include/itkImageToHistogramFilter.h | 7 ++----- .../include/itkImageToHistogramFilter.hxx | 7 ++----- .../include/itkImageToListSampleAdaptor.h | 7 ++----- .../include/itkImageToListSampleAdaptor.hxx | 8 ++------ .../include/itkImageToListSampleFilter.h | 7 ++----- .../include/itkImageToListSampleFilter.hxx | 7 ++----- .../itkJointDomainImageToListSampleAdaptor.h | 7 ++----- .../itkJointDomainImageToListSampleAdaptor.hxx | 8 ++------ Modules/Numerics/Statistics/include/itkKdTree.h | 7 ++----- Modules/Numerics/Statistics/include/itkKdTree.hxx | 8 ++------ .../include/itkKdTreeBasedKmeansEstimator.h | 7 ++----- .../include/itkKdTreeBasedKmeansEstimator.hxx | 7 ++----- .../Statistics/include/itkKdTreeGenerator.h | 7 ++----- .../Statistics/include/itkKdTreeGenerator.hxx | 8 ++------ .../Numerics/Statistics/include/itkListSample.h | 7 ++----- .../Numerics/Statistics/include/itkListSample.hxx | 8 ++------ .../itkMahalanobisDistanceMembershipFunction.h | 7 ++----- .../itkMahalanobisDistanceMembershipFunction.hxx | 7 ++----- .../include/itkMahalanobisDistanceMetric.h | 7 ++----- .../include/itkMahalanobisDistanceMetric.hxx | 8 ++------ .../include/itkManhattanDistanceMetric.h | 7 ++----- .../include/itkManhattanDistanceMetric.hxx | 8 ++------ .../include/itkMaskedImageToHistogramFilter.h | 7 ++----- .../include/itkMaskedImageToHistogramFilter.hxx | 7 ++----- .../Statistics/include/itkMaximumDecisionRule.h | 7 ++----- .../include/itkMaximumRatioDecisionRule.h | 8 +++----- .../Statistics/include/itkMeanSampleFilter.h | 7 ++----- .../Statistics/include/itkMeanSampleFilter.hxx | 7 ++----- .../include/itkMeasurementVectorTraits.h | 8 +++----- .../Statistics/include/itkMembershipFunctionBase.h | 7 ++----- .../Statistics/include/itkMembershipSample.h | 7 ++----- .../Statistics/include/itkMembershipSample.hxx | 8 ++------ .../Statistics/include/itkMinimumDecisionRule.h | 7 ++----- .../include/itkMixtureModelComponentBase.h | 7 ++----- .../include/itkMixtureModelComponentBase.hxx | 8 ++------ .../Statistics/include/itkNeighborhoodSampler.h | 7 ++----- .../Statistics/include/itkNeighborhoodSampler.hxx | 8 ++------ .../Statistics/include/itkNormalVariateGenerator.h | 7 ++----- .../include/itkPointSetToListSampleAdaptor.h | 7 ++----- .../include/itkPointSetToListSampleAdaptor.hxx | 8 ++------ .../include/itkProbabilityDistribution.h | 7 ++----- .../include/itkRegionConstrainedSubsampler.h | 7 ++----- .../include/itkRegionConstrainedSubsampler.hxx | 7 ++----- Modules/Numerics/Statistics/include/itkSample.h | 7 ++----- .../Statistics/include/itkSampleClassifierFilter.h | 7 ++----- .../include/itkSampleClassifierFilter.hxx | 8 ++------ .../include/itkSampleToHistogramFilter.h | 7 ++----- .../include/itkSampleToHistogramFilter.hxx | 7 ++----- .../include/itkSampleToSubsampleFilter.h | 7 ++----- .../include/itkSampleToSubsampleFilter.hxx | 8 ++------ .../itkScalarImageToCooccurrenceListSampleFilter.h | 7 ++----- ...tkScalarImageToCooccurrenceListSampleFilter.hxx | 8 ++------ .../itkScalarImageToCooccurrenceMatrixFilter.h | 7 ++----- .../itkScalarImageToCooccurrenceMatrixFilter.hxx | 7 ++----- .../include/itkScalarImageToHistogramGenerator.h | 7 ++----- .../include/itkScalarImageToHistogramGenerator.hxx | 8 ++------ .../itkScalarImageToRunLengthFeaturesFilter.h | 7 ++----- .../itkScalarImageToRunLengthFeaturesFilter.hxx | 7 ++----- .../itkScalarImageToRunLengthMatrixFilter.h | 7 ++----- .../itkScalarImageToRunLengthMatrixFilter.hxx | 7 ++----- .../itkScalarImageToTextureFeaturesFilter.h | 7 ++----- .../itkScalarImageToTextureFeaturesFilter.hxx | 7 ++----- .../include/itkSparseFrequencyContainer2.h | 7 ++----- .../include/itkSpatialNeighborSubsampler.h | 7 ++----- .../include/itkSpatialNeighborSubsampler.hxx | 7 ++----- .../itkStandardDeviationPerComponentSampleFilter.h | 7 ++----- ...tkStandardDeviationPerComponentSampleFilter.hxx | 7 ++----- .../Statistics/include/itkStatisticsAlgorithm.h | 11 +++-------- .../Statistics/include/itkStatisticsAlgorithm.hxx | 11 +++-------- Modules/Numerics/Statistics/include/itkSubsample.h | 7 ++----- .../Numerics/Statistics/include/itkSubsample.hxx | 7 ++----- .../Statistics/include/itkSubsamplerBase.h | 7 ++----- .../Statistics/include/itkSubsamplerBase.hxx | 7 ++----- .../Numerics/Statistics/include/itkTDistribution.h | 7 ++----- .../itkUniformRandomSpatialNeighborSubsampler.h | 7 ++----- .../itkUniformRandomSpatialNeighborSubsampler.hxx | 7 ++----- .../itkVectorContainerToListSampleAdaptor.h | 7 ++----- .../itkVectorContainerToListSampleAdaptor.hxx | 8 ++------ .../include/itkWeightedCentroidKdTreeGenerator.h | 7 ++----- .../include/itkWeightedCentroidKdTreeGenerator.hxx | 8 ++------ .../include/itkWeightedCovarianceSampleFilter.h | 7 ++----- .../include/itkWeightedCovarianceSampleFilter.hxx | 7 ++----- .../include/itkWeightedMeanSampleFilter.h | 7 ++----- .../include/itkWeightedMeanSampleFilter.hxx | 7 ++----- .../Statistics/src/itkChiSquareDistribution.cxx | 7 ++----- .../Numerics/Statistics/src/itkDecisionRule.cxx | 7 ++----- .../Statistics/src/itkDenseFrequencyContainer2.cxx | 7 ++----- ...xpectationMaximizationMixtureModelEstimator.cxx | 7 ++----- .../Statistics/src/itkGaussianDistribution.cxx | 7 ++----- .../src/itkHistogramToRunLengthFeaturesFilter.cxx | 7 ++----- .../src/itkHistogramToTextureFeaturesFilter.cxx | 7 ++----- .../Statistics/src/itkMaximumDecisionRule.cxx | 7 ++----- .../Statistics/src/itkMaximumRatioDecisionRule.cxx | 7 ++----- .../Statistics/src/itkMinimumDecisionRule.cxx | 7 ++----- .../Statistics/src/itkNormalVariateGenerator.cxx | 7 ++----- .../Statistics/src/itkProbabilityDistribution.cxx | 7 ++----- .../src/itkSparseFrequencyContainer2.cxx | 7 ++----- .../Numerics/Statistics/src/itkTDistribution.cxx | 7 ++----- .../test/itkCovarianceSampleFilterTest3.cxx | 8 +++----- .../Statistics/test/itkDecisionRuleTest.cxx | 11 ++--------- .../Statistics/test/itkDistanceMetricTest.cxx | 11 +++-------- .../Statistics/test/itkDistanceMetricTest2.cxx | 11 +++-------- .../test/itkMembershipFunctionBaseTest.cxx | 12 ++++-------- .../test/itkMembershipFunctionBaseTest2.cxx | 11 +++-------- .../test/itkMixtureModelComponentBaseTest.cxx | 8 +++----- .../test/itkProbabilityDistributionTest.cxx | 8 +++----- .../test/itkRandomVariateGeneratorBaseTest.cxx | 8 +++----- Modules/Numerics/Statistics/test/itkSampleTest.cxx | 12 ++++-------- .../Numerics/Statistics/test/itkSampleTest2.cxx | 12 ++++-------- .../Numerics/Statistics/test/itkSampleTest3.cxx | 12 ++++-------- .../Numerics/Statistics/test/itkSampleTest4.cxx | 12 ++++-------- .../test/itkSampleToSubsampleFilterTest1.cxx | 10 ++-------- .../test/itkWeightedCovarianceSampleFilterTest.cxx | 8 +++----- .../itkWeightedCovarianceSampleFilterTest2.cxx | 7 ++----- .../itkImageRegistrationMethodImageSource.h | 8 +++----- .../include/itkFEMFiniteDifferenceFunctionLoad.h | 7 ++----- .../include/itkFEMFiniteDifferenceFunctionLoad.hxx | 8 ++------ .../FEM/include/itkFEMRegistrationFilter.h | 7 ++----- .../FEM/include/itkFEMRegistrationFilter.hxx | 7 ++----- .../itkPhysicsBasedNonRigidRegistrationMethod.h | 8 ++------ .../itkPhysicsBasedNonRigidRegistrationMethod.hxx | 9 ++------- .../FEM/src/itkFEMRegistrationFilter.cxx | 7 ++----- ...kShapePriorSegmentationLevelSetFunctionTest.cxx | 9 ++++----- .../Watersheds/include/itkWatershedBoundary.h | 7 ++----- .../Watersheds/include/itkWatershedBoundary.hxx | 7 ++----- .../include/itkWatershedBoundaryResolver.h | 7 ++----- .../include/itkWatershedBoundaryResolver.hxx | 7 ++----- .../include/itkWatershedEquivalenceRelabeler.h | 7 ++----- .../include/itkWatershedEquivalenceRelabeler.hxx | 7 ++----- .../Watersheds/include/itkWatershedRelabeler.h | 7 ++----- .../Watersheds/include/itkWatershedRelabeler.hxx | 7 ++----- .../Watersheds/include/itkWatershedSegmentTable.h | 7 ++----- .../include/itkWatershedSegmentTable.hxx | 8 ++------ .../Watersheds/include/itkWatershedSegmentTree.h | 7 ++----- .../Watersheds/include/itkWatershedSegmentTree.hxx | 8 ++------ .../include/itkWatershedSegmentTreeGenerator.h | 7 ++----- .../include/itkWatershedSegmentTreeGenerator.hxx | 7 ++----- .../Watersheds/include/itkWatershedSegmenter.h | 7 ++----- .../Watersheds/include/itkWatershedSegmenter.hxx | 7 ++----- .../Core/test/itkTemporalProcessObjectTest.cxx | 8 +++----- Modules/Video/Core/test/itkVideoSourceTest.cxx | 7 ++----- .../Video/Core/test/itkVideoToVideoFilterTest.cxx | 7 ++----- .../test/itkDecimateFramesVideoFilterTest.cxx | 7 ++----- .../test/itkFrameAverageVideoFilterTest.cxx | 8 +++----- .../test/itkFrameDifferenceVideoFilterTest.cxx | 8 +++----- Utilities/KWStyle/ITK.kws.xml | 2 +- 394 files changed, 840 insertions(+), 2075 deletions(-) diff --git a/Modules/Core/Common/include/itkBinaryOperationConcept.h b/Modules/Core/Common/include/itkBinaryOperationConcept.h index 5b49c2d3131..13f93e94e0f 100644 --- a/Modules/Core/Common/include/itkBinaryOperationConcept.h +++ b/Modules/Core/Common/include/itkBinaryOperationConcept.h @@ -22,11 +22,8 @@ #include "itkPromoteType.h" /// \cond HIDE_META_PROGRAMMING -namespace itk -{ -namespace Details -{ -namespace op + +namespace itk::Details::op { /** Root Binary Operation Concept. * All binary operations are expected to inherit from this type. @@ -99,9 +96,7 @@ struct Div : BinaryOperationConcept } }; -} // namespace op -} // namespace Details -} // namespace itk +} // namespace itk::Details::op /// \endcond #endif // itkBinaryOperationConcept_h diff --git a/Modules/Core/Common/include/itkConceptChecking.h b/Modules/Core/Common/include/itkConceptChecking.h index 44d00d6f640..606b7b3ef8a 100644 --- a/Modules/Core/Common/include/itkConceptChecking.h +++ b/Modules/Core/Common/include/itkConceptChecking.h @@ -107,11 +107,10 @@ #endif -namespace itk -{ + /** All concept class definitions are contained in the "itk::Concept" namespace. */ -namespace Concept +namespace itk::Concept { /** @@ -978,7 +977,6 @@ struct IsFixedPoint itkConceptConstraintsMacro(); }; -} // end namespace Concept -} // end namespace itk +} // namespace itk::Concept #endif diff --git a/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h b/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h index 227986d5b4e..eba744b44a5 100644 --- a/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h +++ b/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h @@ -30,9 +30,7 @@ #include "itkImageToImageFilterDetail.h" -namespace itk -{ -namespace ImageToImageFilterDetail +namespace itk::ImageToImageFilterDetail { /** * Call the base class version: ImageToImageFilterDefaultCopyRegion @@ -156,7 +154,6 @@ class ITK_TEMPLATE_EXPORT ExtractImageFilterRegionCopier : public ImageRegionCop ImageRegionCopier::operator()(destRegion, srcRegion); } }; -} // end namespace ImageToImageFilterDetail -} // end namespace itk +} // namespace itk::ImageToImageFilterDetail #endif diff --git a/Modules/Core/Common/include/itkImageToImageFilterDetail.h b/Modules/Core/Common/include/itkImageToImageFilterDetail.h index a722cf78d89..5f9805f1993 100644 --- a/Modules/Core/Common/include/itkImageToImageFilterDetail.h +++ b/Modules/Core/Common/include/itkImageToImageFilterDetail.h @@ -31,8 +31,7 @@ #include "itkImageRegion.h" #include "itkSmartPointer.h" -namespace itk -{ + /** ImageToImageFilterDetail namespace to house implementations of * functions that are dependent on dimension. These functions are * overloaded based on type unique for each different dimension. @@ -41,7 +40,7 @@ namespace itk * ImageToImageFilter would force the instantiation of all versions of * these overloaded functions. */ -namespace ImageToImageFilterDetail +namespace itk::ImageToImageFilterDetail { /** \struct DispatchBase @@ -448,7 +447,6 @@ class ImageInformationCopier }; -} // end of namespace ImageToImageFilterDetail -} // end namespace itk +} // namespace itk::ImageToImageFilterDetail #endif diff --git a/Modules/Core/Common/include/itkIsNumber.h b/Modules/Core/Common/include/itkIsNumber.h index ad569463968..e06c14f2ce5 100644 --- a/Modules/Core/Common/include/itkIsNumber.h +++ b/Modules/Core/Common/include/itkIsNumber.h @@ -22,10 +22,9 @@ #include "itkMetaProgrammingLibrary.h" #include "itkIntTypes.h" -namespace itk -{ + /// \cond HIDE_META_PROGRAMMING -namespace mpl +namespace itk::mpl { /** Tells whether a type is a number. * \c TrueType for all kinds of numbers from \c short to `long long`, @@ -79,8 +78,7 @@ struct IsNumber : TrueType {}; /// \endcond -} // end namespace mpl +} // namespace itk::mpl /// \endcond -} // end namespace itk #endif // itkIsNumber_h diff --git a/Modules/Core/Common/include/itkLexicographicCompare.h b/Modules/Core/Common/include/itkLexicographicCompare.h index 7f9960a8d67..0f41bb5772d 100644 --- a/Modules/Core/Common/include/itkLexicographicCompare.h +++ b/Modules/Core/Common/include/itkLexicographicCompare.h @@ -23,15 +23,13 @@ #include // For std::begin, std::end, and reverse_iterator. #include "itkMacro.h" -namespace itk -{ /* The Functor was only used in one spot in the LevelSet class, It does not exist in Slicer, BRAINSTools, Remote modules, ANTs, or any other project that I could find. */ -namespace Functor +namespace itk::Functor { /** \class LexicographicCompare * \brief Order Index instances lexicographically. @@ -84,7 +82,6 @@ class CoLexicographicCompare }; -} // end namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Core/Common/include/itkMath.h b/Modules/Core/Common/include/itkMath.h index 7f396de8ef9..fb2e14ef745 100644 --- a/Modules/Core/Common/include/itkMath.h +++ b/Modules/Core/Common/include/itkMath.h @@ -41,10 +41,7 @@ */ #include - -namespace itk -{ -namespace Math +namespace itk::Math { // These constants originate from VXL's vnl_math.h. They have been // moved here to improve visibility, and to ensure that the constants @@ -881,7 +878,6 @@ abs(unsigned long long x) using std::abs; -} // end namespace Math -} // end namespace itk +} // namespace itk::Math #endif // end of itkMath.h diff --git a/Modules/Core/Common/include/itkMathDetail.h b/Modules/Core/Common/include/itkMathDetail.h index 33154e5434e..cf47a563ee8 100644 --- a/Modules/Core/Common/include/itkMathDetail.h +++ b/Modules/Core/Common/include/itkMathDetail.h @@ -74,9 +74,8 @@ namespace itk { -namespace Math -{ -namespace Detail + +namespace Math::Detail { // The functions defined in this namespace are not meant to be used directly // and thus do not adhere to the standard backward-compatibility @@ -515,8 +514,8 @@ union FloatIEEE } }; -} // end namespace Detail -} // end namespace Math +} // namespace Math::Detail +// end namespace Math // move to itkConceptChecking? namespace Concept diff --git a/Modules/Core/Common/include/itkMersenneTwisterRandomVariateGenerator.h b/Modules/Core/Common/include/itkMersenneTwisterRandomVariateGenerator.h index d21cd9f2c48..ff5481694dc 100644 --- a/Modules/Core/Common/include/itkMersenneTwisterRandomVariateGenerator.h +++ b/Modules/Core/Common/include/itkMersenneTwisterRandomVariateGenerator.h @@ -31,9 +31,7 @@ #include #include -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class MersenneTwisterRandomVariateGenerator * \brief MersenneTwisterRandom random variate generator @@ -425,7 +423,6 @@ MersenneTwisterRandomVariateGenerator::GetUniformVariate(const double a, const d // - Fixed out-of-range number generation on 64-bit machines // - Improved portability by substituting literal constants for long enum's // - Changed license from GNU LGPL to BSD -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Core/Common/include/itkMetaDataObjectDetail.h b/Modules/Core/Common/include/itkMetaDataObjectDetail.h index 26201bfc262..c1290e74df2 100644 --- a/Modules/Core/Common/include/itkMetaDataObjectDetail.h +++ b/Modules/Core/Common/include/itkMetaDataObjectDetail.h @@ -23,11 +23,9 @@ #include #include -namespace itk -{ // Implementation details for MetaDataObject meta programming -namespace MetaDataObjectDetail +namespace itk::MetaDataObjectDetail { template struct has_Print : std::false_type @@ -45,7 +43,7 @@ template struct has_output_operator() << std::declval())>> : std::true_type {}; -} // namespace MetaDataObjectDetail -} // namespace itk +} // namespace itk::MetaDataObjectDetail + #endif diff --git a/Modules/Core/Common/include/itkNeighborhoodAlgorithm.h b/Modules/Core/Common/include/itkNeighborhoodAlgorithm.h index baa22d54b7e..aeeb054b78d 100644 --- a/Modules/Core/Common/include/itkNeighborhoodAlgorithm.h +++ b/Modules/Core/Common/include/itkNeighborhoodAlgorithm.h @@ -23,9 +23,7 @@ #include "itkNeighborhoodOperator.h" #include "itkNeighborhoodIterator.h" -namespace itk -{ -namespace NeighborhoodAlgorithm +namespace itk::NeighborhoodAlgorithm { /** \class ImageBoundaryFacesCalculator * \brief Splits an image into a main region and several "face" regions @@ -138,8 +136,7 @@ struct CalculateOutputWrapOffsetModifiers OffsetType operator()(TImage *, TImage *) const; }; -} // end namespace NeighborhoodAlgorithm -} // end namespace itk +} // namespace itk::NeighborhoodAlgorithm #ifndef ITK_MANUAL_INSTANTIATION # include "itkNeighborhoodAlgorithm.hxx" diff --git a/Modules/Core/Common/include/itkNeighborhoodAlgorithm.hxx b/Modules/Core/Common/include/itkNeighborhoodAlgorithm.hxx index d88762ec43e..c0e6537e8c3 100644 --- a/Modules/Core/Common/include/itkNeighborhoodAlgorithm.hxx +++ b/Modules/Core/Common/include/itkNeighborhoodAlgorithm.hxx @@ -22,9 +22,7 @@ #include "itkConstSliceIterator.h" #include // For min. -namespace itk -{ -namespace NeighborhoodAlgorithm +namespace itk::NeighborhoodAlgorithm { template auto @@ -188,7 +186,6 @@ CalculateOutputWrapOffsetModifiers::operator()(TImage * input, TImage * } return ans; } -} // end namespace NeighborhoodAlgorithm -} // end namespace itk +} // namespace itk::NeighborhoodAlgorithm #endif diff --git a/Modules/Core/Common/include/itkPrintHelper.h b/Modules/Core/Common/include/itkPrintHelper.h index bcb37ad5924..f4ccdf64bbf 100644 --- a/Modules/Core/Common/include/itkPrintHelper.h +++ b/Modules/Core/Common/include/itkPrintHelper.h @@ -33,10 +33,7 @@ # undef ITK_CASTXML_GCC_VECTOR_WORKAROUND #endif -namespace itk -{ - -namespace print_helper +namespace itk::print_helper { template @@ -53,7 +50,6 @@ operator<<(std::ostream & os, const std::vector & v) return os << v.back() << ')'; } -} // end namespace print_helper -} // end namespace itk +} // namespace itk::print_helper #endif // itkPrintHelper_h diff --git a/Modules/Core/Common/include/itkPromoteType.h b/Modules/Core/Common/include/itkPromoteType.h index 75f0cea3b75..d96e5cdb92f 100644 --- a/Modules/Core/Common/include/itkPromoteType.h +++ b/Modules/Core/Common/include/itkPromoteType.h @@ -21,11 +21,10 @@ #include "itkMacro.h" // Simplification of boost::common_type -namespace itk -{ + /// \cond HIDE_META_PROGRAMMING -namespace mpl +namespace itk::mpl { namespace Details @@ -154,9 +153,8 @@ struct PromoteType */ using Type = typename Details::SizeToType::Type; }; -} // end namespace mpl +} // namespace itk::mpl /// \endcond -} // end namespace itk #endif // itkPromoteType_h diff --git a/Modules/Core/Common/include/itkRandomVariateGeneratorBase.h b/Modules/Core/Common/include/itkRandomVariateGeneratorBase.h index ffae4015a94..2de206e3394 100644 --- a/Modules/Core/Common/include/itkRandomVariateGeneratorBase.h +++ b/Modules/Core/Common/include/itkRandomVariateGeneratorBase.h @@ -20,9 +20,7 @@ #include "itkObject.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class RandomVariateGeneratorBase * \brief Defines common interfaces for random variate generators. @@ -52,7 +50,6 @@ class ITKCommon_EXPORT RandomVariateGeneratorBase : public Object private: }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Core/Common/src/itkMath.cxx b/Modules/Core/Common/src/itkMath.cxx index 20aad981cf6..44d3aa63d75 100644 --- a/Modules/Core/Common/src/itkMath.cxx +++ b/Modules/Core/Common/src/itkMath.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkMath.h" -namespace itk -{ -namespace Math +namespace itk::Math { namespace @@ -115,5 +113,4 @@ GreatestPrimeFactor(unsigned long long n) return GreatestPrimeFactor(n); } -} // end namespace Math -} // end namespace itk +} // namespace itk::Math diff --git a/Modules/Core/Common/src/itkMersenneTwisterRandomVariateGenerator.cxx b/Modules/Core/Common/src/itkMersenneTwisterRandomVariateGenerator.cxx index 74a5486e911..05797595eea 100644 --- a/Modules/Core/Common/src/itkMersenneTwisterRandomVariateGenerator.cxx +++ b/Modules/Core/Common/src/itkMersenneTwisterRandomVariateGenerator.cxx @@ -21,9 +21,7 @@ #include -namespace itk -{ -namespace Statistics +namespace itk::Statistics { namespace { @@ -286,5 +284,4 @@ MersenneTwisterRandomVariateGenerator::PrintSelf(std::ostream & os, Indent inden os << indent << "Values left before next reload: " << m_Left << std::endl; } -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics diff --git a/Modules/Core/Common/src/itkRandomVariateGeneratorBase.cxx b/Modules/Core/Common/src/itkRandomVariateGeneratorBase.cxx index 8feb541a227..cd54a07862c 100644 --- a/Modules/Core/Common/src/itkRandomVariateGeneratorBase.cxx +++ b/Modules/Core/Common/src/itkRandomVariateGeneratorBase.cxx @@ -17,11 +17,8 @@ *=========================================================================*/ #include "itkRandomVariateGeneratorBase.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { RandomVariateGeneratorBase::RandomVariateGeneratorBase() = default; RandomVariateGeneratorBase::~RandomVariateGeneratorBase() = default; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Core/Common/test/itkLogTester.h b/Modules/Core/Common/test/itkLogTester.h index 14adcb0cb9e..1c56e71c1b5 100644 --- a/Modules/Core/Common/test/itkLogTester.h +++ b/Modules/Core/Common/test/itkLogTester.h @@ -21,9 +21,7 @@ #include "itkLoggerBase.h" #include "itkTestingMacros.h" -namespace itk -{ -namespace Testing +namespace itk::Testing { class LogTester @@ -64,7 +62,7 @@ class LogTester private: itk::LoggerBase * m_Logger{ nullptr }; }; -} // namespace Testing -} // namespace itk +} // namespace itk::Testing + #endif // itkLogTester_h diff --git a/Modules/Core/Common/test/itkPromoteType.cxx b/Modules/Core/Common/test/itkPromoteType.cxx index d8970a6ebb9..4fd04997a55 100644 --- a/Modules/Core/Common/test/itkPromoteType.cxx +++ b/Modules/Core/Common/test/itkPromoteType.cxx @@ -20,9 +20,7 @@ #include #include -namespace itk -{ -namespace mpl +namespace itk::mpl { template @@ -30,8 +28,8 @@ struct PromoteType, std::complex> { using Type = std::complex::Type>; }; -} // namespace mpl -} // namespace itk +} // namespace itk::mpl + int itkPromoteType(int, char *[]) diff --git a/Modules/Core/ImageAdaptors/include/itkAddPixelAccessor.h b/Modules/Core/ImageAdaptors/include/itkAddPixelAccessor.h index 938bf2c61ef..455c88c9aa7 100644 --- a/Modules/Core/ImageAdaptors/include/itkAddPixelAccessor.h +++ b/Modules/Core/ImageAdaptors/include/itkAddPixelAccessor.h @@ -20,9 +20,7 @@ #include "itkNumericTraits.h" -namespace itk -{ -namespace Accessor +namespace itk::Accessor { /** * \class AddPixelAccessor @@ -100,7 +98,6 @@ class AddPixelAccessor private: TPixel m_Value; }; -} // end namespace Accessor -} // end namespace itk +} // namespace itk::Accessor #endif diff --git a/Modules/Core/ImageAdaptors/include/itkRGBToVectorPixelAccessor.h b/Modules/Core/ImageAdaptors/include/itkRGBToVectorPixelAccessor.h index bdd3b5bd8c8..8c8f0b9a242 100644 --- a/Modules/Core/ImageAdaptors/include/itkRGBToVectorPixelAccessor.h +++ b/Modules/Core/ImageAdaptors/include/itkRGBToVectorPixelAccessor.h @@ -21,9 +21,7 @@ #include "itkRGBPixel.h" #include "itkVector.h" -namespace itk -{ -namespace Accessor +namespace itk::Accessor { /** * \class RGBToVectorPixelAccessor @@ -73,7 +71,6 @@ class RGBToVectorPixelAccessor private: }; -} // end namespace Accessor -} // end namespace itk +} // namespace itk::Accessor #endif diff --git a/Modules/Core/ImageAdaptors/include/itkVectorToRGBPixelAccessor.h b/Modules/Core/ImageAdaptors/include/itkVectorToRGBPixelAccessor.h index d2ccc4be891..1e62f765471 100644 --- a/Modules/Core/ImageAdaptors/include/itkVectorToRGBPixelAccessor.h +++ b/Modules/Core/ImageAdaptors/include/itkVectorToRGBPixelAccessor.h @@ -21,9 +21,7 @@ #include "itkRGBPixel.h" #include "itkVector.h" -namespace itk -{ -namespace Accessor +namespace itk::Accessor { /** * \class VectorToRGBPixelAccessor @@ -74,7 +72,6 @@ class VectorToRGBPixelAccessor private: }; -} // end namespace Accessor -} // end namespace itk +} // namespace itk::Accessor #endif diff --git a/Modules/Core/TestKernel/include/itkGTest.h b/Modules/Core/TestKernel/include/itkGTest.h index 63bfc33ea0d..d6f5e481dfc 100644 --- a/Modules/Core/TestKernel/include/itkGTest.h +++ b/Modules/Core/TestKernel/include/itkGTest.h @@ -23,8 +23,6 @@ #include "itkGTestPredicate.h" #include "itkGTestTypedefsAndConstructors.h" -namespace itk -{ /** \namespace itk::GTest * \brief The GTest namespace contains GTest extensions for ITK, and @@ -32,9 +30,8 @@ namespace itk * results and values. * */ -namespace GTest -{} // end namespace GTest -} // end namespace itk + +// end namespace itk #endif // itkGTest_h diff --git a/Modules/Core/TestKernel/include/itkGTestPredicate.h b/Modules/Core/TestKernel/include/itkGTestPredicate.h index a95cf5cb913..5d82a37f288 100644 --- a/Modules/Core/TestKernel/include/itkGTestPredicate.h +++ b/Modules/Core/TestKernel/include/itkGTestPredicate.h @@ -34,17 +34,11 @@ EXPECT_PRED_FORMAT3(itk::GTest::Predicate::VectorDoubleRMSPredFormat, val1, val2, rmsError) -namespace itk -{ - -namespace GTest -{ - /** \namespace itk::GTest::Predicate * \brief The Predicate namespace contains functions used to * implement custom GTest Predicate-Formatters. */ -namespace Predicate +namespace itk::GTest::Predicate { /** Implements GTest Predicate Formatter for ITK_EXPECT_VECTOR_NEAR @@ -89,8 +83,7 @@ VectorDoubleRMSPredFormat(const char * expr1, << rmsErrorExpr << " evaluates to " << rmsError << '.'; } -} // end namespace Predicate -} // end namespace GTest -} // end namespace itk +} // namespace itk::GTest::Predicate +// end namespace GTest #endif // itkGTestPredicate_h diff --git a/Modules/Core/TestKernel/include/itkGTestTypedefsAndConstructors.h b/Modules/Core/TestKernel/include/itkGTestTypedefsAndConstructors.h index 44a367a9ce4..3265d35263d 100644 --- a/Modules/Core/TestKernel/include/itkGTestTypedefsAndConstructors.h +++ b/Modules/Core/TestKernel/include/itkGTestTypedefsAndConstructors.h @@ -24,14 +24,7 @@ #include "itkImageBase.h" - -namespace itk -{ - -namespace GTest -{ - -namespace TypedefsAndConstructors +namespace itk::GTest::TypedefsAndConstructors { /** \namespace itk::GTest::TypedefsAndConstructors::Dimension2 @@ -77,9 +70,8 @@ using RegionType = ImageBaseType::RegionType; } // end namespace Dimension3 -} // end namespace TypedefsAndConstructors -} // end namespace GTest -} // end namespace itk +} // namespace itk::GTest::TypedefsAndConstructors +// end namespace GTest #endif // itkGTestTypedefsAndConstructors_h diff --git a/Modules/Core/TestKernel/include/itkTestingComparisonImageFilter.h b/Modules/Core/TestKernel/include/itkTestingComparisonImageFilter.h index 28b908f7046..29c527faf3f 100644 --- a/Modules/Core/TestKernel/include/itkTestingComparisonImageFilter.h +++ b/Modules/Core/TestKernel/include/itkTestingComparisonImageFilter.h @@ -23,9 +23,7 @@ #include "itkImageToImageFilter.h" #include -namespace itk -{ -namespace Testing +namespace itk::Testing { /** * \class ComparisonImageFilter @@ -144,8 +142,7 @@ class ITK_TEMPLATE_EXPORT ComparisonImageFilter : public ImageToImageFilter // For abs. -namespace itk -{ -namespace Testing +namespace itk::Testing { //---------------------------------------------------------------------------- template @@ -236,7 +234,6 @@ ComparisonImageFilter::VerifyInputInformation() const } -} // end namespace Testing -} // end namespace itk +} // namespace itk::Testing #endif diff --git a/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.h b/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.h index 9a21d61f302..a1b4e36e8a4 100644 --- a/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.h +++ b/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.h @@ -22,9 +22,7 @@ #include "itkImageSource.h" #include "itkExtractImageFilterRegionCopier.h" -namespace itk -{ -namespace Testing +namespace itk::Testing { /** \class ExtractSliceImageFilterEnums * \brief Contains all enum classes used by the ExtractSliceImageFilterEnums class. @@ -305,8 +303,7 @@ class ITK_TEMPLATE_EXPORT ExtractSliceImageFilter : public ImageSource @@ -287,7 +285,6 @@ ExtractSliceImageFilter::GetInput() const return itkDynamicCastInDebugMode(this->GetPrimaryInput()); } -} // end namespace Testing -} // end namespace itk +} // namespace itk::Testing #endif diff --git a/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h b/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h index dd8f6d8305b..101e17e0f46 100644 --- a/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h +++ b/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h @@ -22,9 +22,7 @@ #include "itkSimpleDataObjectDecorator.h" #include "itkInPlaceImageFilter.h" -namespace itk -{ -namespace Testing +namespace itk::Testing { /** \class HashImageFilterEnums * \brief Enum classes for HashImageFilter @@ -156,8 +154,7 @@ class ITK_TEMPLATE_EXPORT HashImageFilter : public InPlaceImageFilter @@ -140,7 +138,6 @@ HashImageFilter::PrintSelf(std::ostream & os, Indent indent) const os << indent << "HashFunction: " << m_HashFunction << std::endl; } -} // end namespace Testing -} // end namespace itk +} // namespace itk::Testing #endif // itkTestingHashImageFilter_hxx diff --git a/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h b/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h index a0df764c4a0..88035c5b364 100644 --- a/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h +++ b/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h @@ -20,9 +20,7 @@ #include "itkUnaryFunctorImageFilter.h" -namespace itk -{ -namespace Testing +namespace itk::Testing { /** @@ -124,8 +122,7 @@ class ITK_TEMPLATE_EXPORT StretchIntensityImageFilter : public ImageSource @@ -163,7 +161,6 @@ StretchIntensityImageFilter::PrintSelf(std::ostream & os << indent << "Output Maximum: " << static_cast::PrintType>(m_OutputMaximum) << std::endl; } -} // end namespace Testing -} // end namespace itk +} // namespace itk::Testing #endif diff --git a/Modules/Core/TestKernel/src/itkTestingExtractSliceImageFilter.cxx b/Modules/Core/TestKernel/src/itkTestingExtractSliceImageFilter.cxx index 42275cb2042..4212fa6c4f2 100644 --- a/Modules/Core/TestKernel/src/itkTestingExtractSliceImageFilter.cxx +++ b/Modules/Core/TestKernel/src/itkTestingExtractSliceImageFilter.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkTestingExtractSliceImageFilter.h" -namespace itk -{ -namespace Testing +namespace itk::Testing { /** Print enum values */ std::ostream & @@ -45,5 +43,4 @@ operator<<(std::ostream & out, const ExtractSliceImageFilterEnums::TestExtractSl } }(); } -} // end namespace Testing -} // end namespace itk +} // namespace itk::Testing diff --git a/Modules/Core/TestKernel/src/itkTestingHashImageFilter.cxx b/Modules/Core/TestKernel/src/itkTestingHashImageFilter.cxx index 19e2e120f7a..60eb8795d86 100644 --- a/Modules/Core/TestKernel/src/itkTestingHashImageFilter.cxx +++ b/Modules/Core/TestKernel/src/itkTestingHashImageFilter.cxx @@ -28,9 +28,7 @@ #include "itkTestingHashImageFilter.h" -namespace itk -{ -namespace Testing +namespace itk::Testing { /** Print enum values */ std::ostream & @@ -46,5 +44,4 @@ operator<<(std::ostream & out, const HashImageFilterEnums::HashFunction value) } }(); } -} // namespace Testing -} // namespace itk +} // namespace itk::Testing diff --git a/Modules/Core/Transform/include/itkv3Rigid3DTransform.h b/Modules/Core/Transform/include/itkv3Rigid3DTransform.h index ec1fa8a4d41..d61190bfc2e 100644 --- a/Modules/Core/Transform/include/itkv3Rigid3DTransform.h +++ b/Modules/Core/Transform/include/itkv3Rigid3DTransform.h @@ -22,9 +22,7 @@ #include "itkRigid3DTransform.h" #include "itkVersor.h" -namespace itk -{ -namespace v3 +namespace itk::v3 { /** \class Rigid3DTransform * \brief ITK3.x compatible Rigid3DTransform of a vector space (e.g. space coordinates) @@ -130,8 +128,8 @@ class ITK_TEMPLATE_EXPORT Rigid3DTransform : public itk::Rigid3DTransform @@ -328,8 +326,8 @@ class TransformTester }; -} // namespace itkTransformTestHelpers -} // namespace itk +} // namespace itk::itkTransformTestHelpers + int itkTransformTest(int, char *[]) diff --git a/Modules/Filtering/Colormap/include/itkAutumnColormapFunction.h b/Modules/Filtering/Colormap/include/itkAutumnColormapFunction.h index d59b133e725..b3c4cb18dfe 100644 --- a/Modules/Filtering/Colormap/include/itkAutumnColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkAutumnColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class AutumnColormapFunction @@ -64,8 +62,7 @@ class ITK_TEMPLATE_EXPORT AutumnColormapFunction : public ColormapFunction auto @@ -47,7 +44,6 @@ AutumnColormapFunction::operator()(const TScalar & v) const return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkBlueColormapFunction.h b/Modules/Filtering/Colormap/include/itkBlueColormapFunction.h index 98dddafa86d..f8b05718e03 100644 --- a/Modules/Filtering/Colormap/include/itkBlueColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkBlueColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class BlueColormapFunction @@ -64,8 +62,7 @@ class ITK_TEMPLATE_EXPORT BlueColormapFunction : public ColormapFunction auto @@ -40,7 +37,6 @@ BlueColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkColormapFunction.h b/Modules/Filtering/Colormap/include/itkColormapFunction.h index 6ce56f8f40f..a895fee40c5 100644 --- a/Modules/Filtering/Colormap/include/itkColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkColormapFunction.h @@ -23,9 +23,7 @@ #include "itkNumericTraits.h" #include "itkRGBPixel.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class ColormapFunction @@ -136,7 +134,6 @@ class ColormapFunction : public Object RGBComponentType m_MinimumRGBComponentValue{}; RGBComponentType m_MaximumRGBComponentValue{}; }; -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkCoolColormapFunction.h b/Modules/Filtering/Colormap/include/itkCoolColormapFunction.h index aa489991075..8614cda5012 100644 --- a/Modules/Filtering/Colormap/include/itkCoolColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkCoolColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class CoolColormapFunction @@ -64,8 +62,7 @@ class ITK_TEMPLATE_EXPORT CoolColormapFunction : public ColormapFunction auto @@ -47,7 +44,6 @@ CoolColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkCopperColormapFunction.h b/Modules/Filtering/Colormap/include/itkCopperColormapFunction.h index 05c27bdc2a6..54e0c6c3d8a 100644 --- a/Modules/Filtering/Colormap/include/itkCopperColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkCopperColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class CopperColormapFunction @@ -64,8 +62,7 @@ class ITK_TEMPLATE_EXPORT CopperColormapFunction : public ColormapFunction auto @@ -49,7 +46,6 @@ CopperColormapFunction::operator()(const TScalar & v) const return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkCustomColormapFunction.h b/Modules/Filtering/Colormap/include/itkCustomColormapFunction.h index 7820aa60e33..d9a7b7f242b 100644 --- a/Modules/Filtering/Colormap/include/itkCustomColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkCustomColormapFunction.h @@ -22,9 +22,7 @@ #include -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class CustomColormapFunction @@ -113,8 +111,7 @@ class ITK_TEMPLATE_EXPORT CustomColormapFunction : public ColormapFunction auto @@ -69,7 +66,6 @@ CustomColormapFunction::operator()(const TScalar & v) const return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkGreenColormapFunction.h b/Modules/Filtering/Colormap/include/itkGreenColormapFunction.h index 19814c5af1c..8428a9eaff9 100644 --- a/Modules/Filtering/Colormap/include/itkGreenColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkGreenColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class GreenColormapFunction @@ -64,8 +62,7 @@ class ITK_TEMPLATE_EXPORT GreenColormapFunction : public ColormapFunction auto @@ -40,7 +37,6 @@ GreenColormapFunction::operator()(const TScalar & v) const - return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkGreyColormapFunction.h b/Modules/Filtering/Colormap/include/itkGreyColormapFunction.h index b8788d07e36..8b7f74b6e05 100644 --- a/Modules/Filtering/Colormap/include/itkGreyColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkGreyColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class GreyColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT GreyColormapFunction : public ColormapFunction auto @@ -40,7 +37,6 @@ GreyColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkHSVColormapFunction.h b/Modules/Filtering/Colormap/include/itkHSVColormapFunction.h index 91a9c7d6a0b..1118b8f5ea0 100644 --- a/Modules/Filtering/Colormap/include/itkHSVColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkHSVColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class HSVColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT HSVColormapFunction : public ColormapFunction auto @@ -51,7 +48,6 @@ HSVColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkHotColormapFunction.h b/Modules/Filtering/Colormap/include/itkHotColormapFunction.h index 4dfa04fd36c..6f44c177bb7 100644 --- a/Modules/Filtering/Colormap/include/itkHotColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkHotColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class HotColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT HotColormapFunction : public ColormapFunction auto @@ -50,7 +47,6 @@ HotColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkJetColormapFunction.h b/Modules/Filtering/Colormap/include/itkJetColormapFunction.h index 05afcb6b70a..fc04158592d 100644 --- a/Modules/Filtering/Colormap/include/itkJetColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkJetColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class JetColormapFunction @@ -69,8 +67,7 @@ class ITK_TEMPLATE_EXPORT JetColormapFunction : public ColormapFunction auto @@ -50,7 +47,6 @@ JetColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkOverUnderColormapFunction.h b/Modules/Filtering/Colormap/include/itkOverUnderColormapFunction.h index 628f11f6e6e..ea6b23b2c1f 100644 --- a/Modules/Filtering/Colormap/include/itkOverUnderColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkOverUnderColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class OverUnderColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT OverUnderColormapFunction : public ColormapFunction auto @@ -60,7 +57,6 @@ OverUnderColormapFunction::operator()(const TScalar & v) con return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkRedColormapFunction.h b/Modules/Filtering/Colormap/include/itkRedColormapFunction.h index ac8ed95b5af..53ee715ea0f 100644 --- a/Modules/Filtering/Colormap/include/itkRedColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkRedColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class RedColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT RedColormapFunction : public ColormapFunction auto @@ -40,7 +37,6 @@ RedColormapFunction::operator()(const TScalar & v) const -> return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkSpringColormapFunction.h b/Modules/Filtering/Colormap/include/itkSpringColormapFunction.h index d677e48bc07..73f9e0dd82f 100644 --- a/Modules/Filtering/Colormap/include/itkSpringColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkSpringColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class SpringColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT SpringColormapFunction : public ColormapFunction auto @@ -47,7 +44,6 @@ SpringColormapFunction::operator()(const TScalar & v) const return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkSummerColormapFunction.h b/Modules/Filtering/Colormap/include/itkSummerColormapFunction.h index 9ef16562c4e..66fc4a52f7b 100644 --- a/Modules/Filtering/Colormap/include/itkSummerColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkSummerColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class SummerColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT SummerColormapFunction : public ColormapFunction auto @@ -47,7 +44,6 @@ SummerColormapFunction::operator()(const TScalar & v) const return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/include/itkWinterColormapFunction.h b/Modules/Filtering/Colormap/include/itkWinterColormapFunction.h index 3ed2ff0e066..7a19684d34a 100644 --- a/Modules/Filtering/Colormap/include/itkWinterColormapFunction.h +++ b/Modules/Filtering/Colormap/include/itkWinterColormapFunction.h @@ -20,9 +20,7 @@ #include "itkColormapFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class WinterColormapFunction @@ -65,8 +63,7 @@ class ITK_TEMPLATE_EXPORT WinterColormapFunction : public ColormapFunction auto @@ -47,7 +44,6 @@ WinterColormapFunction::operator()(const TScalar & v) const return pixel; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Filtering/Colormap/test/itkCustomColormapFunctionTest.cxx b/Modules/Filtering/Colormap/test/itkCustomColormapFunctionTest.cxx index 5a479a12c7f..86eb00d2056 100644 --- a/Modules/Filtering/Colormap/test/itkCustomColormapFunctionTest.cxx +++ b/Modules/Filtering/Colormap/test/itkCustomColormapFunctionTest.cxx @@ -21,10 +21,7 @@ #include "itkImageFileReader.h" #include "itkTestingMacros.h" - -namespace itk -{ -namespace Function +namespace itk::Function { /** @@ -99,8 +96,7 @@ class CustomColormapFunctionHelper : public CustomColormapFunction class ITK_TEMPLATE_EXPORT InvertIntensityFunctor{ public: InputPixelType operator()(InputPixelType input) @@ -35,8 +34,7 @@ return NumericTraits::OneValue(); } // namespace itk } ; -} // namespace Functor -} // namespace itk +} // namespace itk::Functor namespace itk { diff --git a/Modules/Filtering/FFT/include/itkFFTWCommonExtended.h b/Modules/Filtering/FFT/include/itkFFTWCommonExtended.h index 5594042729e..a59dd98225f 100644 --- a/Modules/Filtering/FFT/include/itkFFTWCommonExtended.h +++ b/Modules/Filtering/FFT/include/itkFFTWCommonExtended.h @@ -29,10 +29,7 @@ #include -namespace itk -{ - -namespace fftw +namespace itk::fftw { /** * \class Interface @@ -361,6 +358,6 @@ class ComplexToComplexProxy }; #endif -} // namespace fftw -} // namespace itk +} // namespace itk::fftw + #endif diff --git a/Modules/Filtering/ImageFusion/include/itkLabelOverlayFunctor.h b/Modules/Filtering/ImageFusion/include/itkLabelOverlayFunctor.h index ba65ae6d584..ffa053d6e0b 100644 --- a/Modules/Filtering/ImageFusion/include/itkLabelOverlayFunctor.h +++ b/Modules/Filtering/ImageFusion/include/itkLabelOverlayFunctor.h @@ -21,9 +21,7 @@ #include "itkLabelToRGBFunctor.h" #include "itkMath.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { /** * \class LabelOverlayFunctor @@ -138,7 +136,6 @@ class LabelOverlayFunctor typename Functor::LabelToRGBFunctor m_RGBFunctor; }; -} // end namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/ImageFusion/include/itkLabelToRGBFunctor.h b/Modules/Filtering/ImageFusion/include/itkLabelToRGBFunctor.h index c52e804f2fb..a450c452f34 100644 --- a/Modules/Filtering/ImageFusion/include/itkLabelToRGBFunctor.h +++ b/Modules/Filtering/ImageFusion/include/itkLabelToRGBFunctor.h @@ -21,9 +21,7 @@ #include #include "itkNumericTraits.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { /** * \class LabelToRGBFunctor @@ -162,7 +160,6 @@ class LabelToRGBFunctor TLabel m_BackgroundValue; }; -} // end namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.h b/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.h index 5e97051e192..7e3f3d29508 100644 --- a/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.h +++ b/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.h @@ -20,9 +20,7 @@ #include "itkRGBPixel.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { /** * \class ScalarToRGBPixelFunctor @@ -95,8 +93,7 @@ class ITK_TEMPLATE_EXPORT ScalarToRGBPixelFunctor bool m_UseMSBForHashing; unsigned int m_ColorIndex[3]; }; -} // end namespace Functor -} // end namespace itk +} // namespace itk::Functor #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarToRGBPixelFunctor.hxx" diff --git a/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.hxx b/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.hxx index 96866910f04..79eb4bfdd46 100644 --- a/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.hxx +++ b/Modules/Filtering/ImageFusion/include/itkScalarToRGBPixelFunctor.hxx @@ -20,9 +20,7 @@ #include "itkByteSwapper.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { template ScalarToRGBPixelFunctor::ScalarToRGBPixelFunctor() @@ -71,7 +69,6 @@ ScalarToRGBPixelFunctor::operator()(const TScalar & v) const -> RGBPixe return ans; } -} // end namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h b/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h index 0c4dc5d36d3..f0d0c562e70 100644 --- a/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h +++ b/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h @@ -20,9 +20,7 @@ #include "itkMath.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { /** @@ -361,7 +359,7 @@ class UnaryMinus return (TOutput)(-A); } }; -} // namespace Functor -} // namespace itk +} // namespace itk::Functor + #endif diff --git a/Modules/Filtering/ImageIntensity/include/itkBitwiseOpsFunctors.h b/Modules/Filtering/ImageIntensity/include/itkBitwiseOpsFunctors.h index 28b86c9fd33..87f3e94cca6 100644 --- a/Modules/Filtering/ImageIntensity/include/itkBitwiseOpsFunctors.h +++ b/Modules/Filtering/ImageIntensity/include/itkBitwiseOpsFunctors.h @@ -20,9 +20,7 @@ #include "itkMacro.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { /** @@ -123,7 +121,6 @@ class BitwiseNot return static_cast(~A); } }; -} // namespace Functor -} // namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/ImageIntensity/include/itkLogicOpsFunctors.h b/Modules/Filtering/ImageIntensity/include/itkLogicOpsFunctors.h index ef35b2b6396..ebbabbd4386 100644 --- a/Modules/Filtering/ImageIntensity/include/itkLogicOpsFunctors.h +++ b/Modules/Filtering/ImageIntensity/include/itkLogicOpsFunctors.h @@ -21,10 +21,7 @@ #include "itkNumericTraits.h" #include "itkMath.h" - -namespace itk -{ -namespace Functor +namespace itk::Functor { /** @@ -370,7 +367,7 @@ class ITK_TEMPLATE_EXPORT TernaryOperator } }; -} // namespace Functor -} // namespace itk +} // namespace itk::Functor + #endif diff --git a/Modules/Filtering/ImageIntensity/src/itkSymmetricEigenAnalysisImageFilter.cxx b/Modules/Filtering/ImageIntensity/src/itkSymmetricEigenAnalysisImageFilter.cxx index 2e0aea97489..3c44ff88f04 100644 --- a/Modules/Filtering/ImageIntensity/src/itkSymmetricEigenAnalysisImageFilter.cxx +++ b/Modules/Filtering/ImageIntensity/src/itkSymmetricEigenAnalysisImageFilter.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkSymmetricEigenAnalysisImageFilter.h" -namespace itk -{ -namespace Functor +namespace itk::Functor { /** Define how to print enumerations */ std::ostream & @@ -39,5 +37,4 @@ operator<<(std::ostream & out, const EigenValueOrderEnum value) } }(); } -} // namespace Functor -} // end namespace itk +} // namespace itk::Functor diff --git a/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h b/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h index f12ca8eb841..a93df0372e6 100644 --- a/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h +++ b/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h @@ -22,9 +22,8 @@ #include "itkStructHashFunction.h" #include "itkMath.h" #include -namespace itk -{ -namespace Function + +namespace itk::Function { /* \class AdaptiveEqualizationHistogram @@ -156,7 +155,6 @@ class AdaptiveEqualizationHistogram size_t m_BoundaryCount{ 0 }; }; -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif // itkAdaptiveHistogramHistogram_h diff --git a/Modules/Filtering/ImageStatistics/test/itkProjectionImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkProjectionImageFilterTest.cxx index 24eb97a7f8d..81b0c6c8341 100644 --- a/Modules/Filtering/ImageStatistics/test/itkProjectionImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkProjectionImageFilterTest.cxx @@ -24,11 +24,7 @@ #include "itkProjectionImageFilter.h" #include "itkTestingMacros.h" -namespace itk -{ -namespace ProjectionImageFilterNamespace -{ -namespace Function +namespace itk::ProjectionImageFilterNamespace::Function { template @@ -66,10 +62,9 @@ class BinaryAccumulator bool m_IsForeground{ false }; }; -} // end namespace Function +} // namespace itk::ProjectionImageFilterNamespace::Function -} // end namespace ProjectionImageFilterNamespace -} // end namespace itk +// end namespace ProjectionImageFilterNamespace int itkProjectionImageFilterTest(int argc, char * argv[]) diff --git a/Modules/Filtering/LabelMap/include/itkLabelObjectAccessors.h b/Modules/Filtering/LabelMap/include/itkLabelObjectAccessors.h index eaf4e8f0e3e..b27a26e8777 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelObjectAccessors.h +++ b/Modules/Filtering/LabelMap/include/itkLabelObjectAccessors.h @@ -29,9 +29,7 @@ * */ -namespace itk -{ -namespace Functor +namespace itk::Functor { template class LabelLabelObjectAccessor @@ -102,7 +100,6 @@ class LabelObjectReverseComparator private: AttributeAccessorType m_Accessor; }; -} // namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/LabelMap/include/itkLabelObjectLineComparator.h b/Modules/Filtering/LabelMap/include/itkLabelObjectLineComparator.h index 33b42050be5..89d30afd188 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelObjectLineComparator.h +++ b/Modules/Filtering/LabelMap/include/itkLabelObjectLineComparator.h @@ -18,9 +18,7 @@ #ifndef itkLabelObjectLineComparator_h #define itkLabelObjectLineComparator_h -namespace itk -{ -namespace Functor +namespace itk::Functor { /** @@ -62,7 +60,6 @@ class LabelObjectLineComparator } }; -} // end namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/LabelMap/include/itkShapeLabelObjectAccessors.h b/Modules/Filtering/LabelMap/include/itkShapeLabelObjectAccessors.h index 40ccee1495f..20b0b79f3eb 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeLabelObjectAccessors.h +++ b/Modules/Filtering/LabelMap/include/itkShapeLabelObjectAccessors.h @@ -30,9 +30,7 @@ * */ -namespace itk -{ -namespace Functor +namespace itk::Functor { template class NumberOfPixelsLabelObjectAccessor @@ -272,7 +270,6 @@ class PerimeterOnBorderRatioLabelObjectAccessor } }; -} // namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsLabelObjectAccessors.h b/Modules/Filtering/LabelMap/include/itkStatisticsLabelObjectAccessors.h index 8f19a86555b..27c8f492389 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsLabelObjectAccessors.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsLabelObjectAccessors.h @@ -28,9 +28,7 @@ * */ -namespace itk -{ -namespace Functor +namespace itk::Functor { template class MinimumLabelObjectAccessor @@ -285,7 +283,6 @@ class WeightedFlatnessLabelObjectAccessor return labelObject->GetWeightedFlatness(); } }; -} // namespace Functor -} // end namespace itk +} // namespace itk::Functor #endif diff --git a/Modules/Filtering/MathematicalMorphology/include/itkMorphologyHistogram.h b/Modules/Filtering/MathematicalMorphology/include/itkMorphologyHistogram.h index ae9b6a482d8..dc74c3792f3 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkMorphologyHistogram.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkMorphologyHistogram.h @@ -23,9 +23,7 @@ #include "itkIntTypes.h" #include "itkNumericTraits.h" -namespace itk -{ -namespace Function +namespace itk::Function { template class MorphologyHistogram @@ -222,7 +220,6 @@ class MorphologyHistogram : public VectorMorphologyHistogram #include -namespace itk -{ -namespace Function +namespace itk::Function { /* \class RankHistogram @@ -409,6 +407,5 @@ class ITK_TEMPLATE_EXPORT RankHistogram : public VectorRankHistogram /// \endcond -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/IO/ImageBase/include/itkInternationalizationIOHelpers.h b/Modules/IO/ImageBase/include/itkInternationalizationIOHelpers.h index b1624402d12..2b2d5245304 100644 --- a/Modules/IO/ImageBase/include/itkInternationalizationIOHelpers.h +++ b/Modules/IO/ImageBase/include/itkInternationalizationIOHelpers.h @@ -62,9 +62,7 @@ # include "itkfdstream/fdstream.hxx" #endif -namespace itk -{ -namespace i18n +namespace itk::i18n { // Check if the string is correctly encoded #if LOCAL_USE_WIN32_WOPEN @@ -291,8 +289,8 @@ class I18nIfstream : public std::ifstream using I18nOfstream = std::ofstream; using I18nIfstream = std::ifstream; #endif -} // namespace i18n -} // namespace itk +} // namespace itk::i18n + #undef LOCAL_USE_WIN32_WOPEN #undef LOCAL_USE_FDSTREAM diff --git a/Modules/IO/MeshBase/include/itkMeshIOTestHelper.h b/Modules/IO/MeshBase/include/itkMeshIOTestHelper.h index 20db8508e12..40a68174cb6 100644 --- a/Modules/IO/MeshBase/include/itkMeshIOTestHelper.h +++ b/Modules/IO/MeshBase/include/itkMeshIOTestHelper.h @@ -367,9 +367,7 @@ TestBaseClassMethodsMeshIO(typename TMeshIO::Pointer meshIO) return EXIT_SUCCESS; } -namespace itk -{ -namespace MeshIOTestHelper +namespace itk::MeshIOTestHelper { template @@ -419,7 +417,7 @@ AllocateBuffer(itk::IOComponentEnum componentType, itk::SizeValueType bufferSize return nullptr; } -} // namespace MeshIOTestHelper -} // namespace itk +} // namespace itk::MeshIOTestHelper + #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement1DStress.h b/Modules/Numerics/FEM/include/itkFEMElement1DStress.h index 0b8eaa4452a..370e065f8d2 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement1DStress.h +++ b/Modules/Numerics/FEM/include/itkFEMElement1DStress.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element1DStress @@ -127,8 +125,7 @@ class ITK_TEMPLATE_EXPORT Element1DStress : public TBaseClass const MaterialLinearElasticity * m_mat{ nullptr }; }; // class Element1DStress -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement1DStress.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement1DStress.hxx b/Modules/Numerics/FEM/include/itkFEMElement1DStress.hxx index 950b80c615d..07af150a158 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement1DStress.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement1DStress.hxx @@ -21,9 +21,7 @@ #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { template Element1DStress::Element1DStress() @@ -97,7 +95,6 @@ Element1DStress::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Young Modulus: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLine.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLine.h index f2757b39e4f..aa82a7c220a 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLine.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLine.h @@ -22,9 +22,7 @@ #include "itkFEMElementStd.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearLine @@ -116,7 +114,6 @@ class ITKFEM_EXPORT Element2DC0LinearLine : public ElementStd<2, 2> // hierarchy. Sometimes it is, // sometimes it is not. }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearLine_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLineStress.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLineStress.h index f24cb3b6f9a..f45c55c26d7 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLineStress.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearLineStress.h @@ -23,9 +23,7 @@ #include "itkFEMElement1DStress.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearLineStress @@ -75,7 +73,6 @@ class ITKFEM_EXPORT Element2DC0LinearLineStress : public Element1DStress private: }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearQuadrilateral_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralMembrane.h index 476f8128d0d..d4bdbc36fb9 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralMembrane.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DMembrane.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearQuadrilateralMembrane @@ -95,7 +93,6 @@ class ITKFEM_EXPORT Element2DC0LinearQuadrilateralMembrane : public Element2DMem PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element2DC0LinearQuadrilateralMembrane -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearQuadrilateralMembrane_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStrain.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStrain.h index 6f311bd5e4e..ac1fa35ccb7 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStrain.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DStrain.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearQuadrilateralStrain @@ -94,7 +92,6 @@ class ITKFEM_EXPORT Element2DC0LinearQuadrilateralStrain : public Element2DStrai private: }; // class Element2DC0LinearQuadrilateralStrain -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearQuadrilateralStrain_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStress.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStress.h index 7133dc7b80e..bb088a30188 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStress.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearQuadrilateralStress.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DStress.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearQuadrilateralStress @@ -95,7 +93,6 @@ class ITKFEM_EXPORT Element2DC0LinearQuadrilateralStress : public Element2DStres PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element2DC0LinearQuadrilateralStress -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearQuadrilateralStress_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangular.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangular.h index 37f7f998b50..8c519572cc4 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangular.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangular.h @@ -22,9 +22,7 @@ #include "itkFEMElementStd.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearTriangular @@ -130,7 +128,6 @@ class ITKFEM_EXPORT Element2DC0LinearTriangular : public ElementStd<3, 2> void PrintSelf(std::ostream & os, Indent indent) const override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearTriangular_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularMembrane.h index 996c28d656c..905105d6f45 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularMembrane.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DMembrane.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearTriangularMembrane @@ -95,7 +93,6 @@ class ITKFEM_EXPORT Element2DC0LinearTriangularMembrane : public Element2DMembra PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element2DC0LinearTriangularMembrane -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0LinearTriangularMembrane_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularStrain.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularStrain.h index 65e15f4a953..9f1651dbca8 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0LinearTriangularStrain.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DStrain.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0LinearTriangularStrain @@ -93,7 +91,6 @@ class ITKFEM_EXPORT Element2DC0LinearTriangularStrain : public Element2DStrain void PopulateEdgeIds() override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0QuadraticTriangular_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStrain.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStrain.h index 0d47bb1c7fb..be2a3363770 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStrain.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DStrain.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0QuadraticTriangularStrain @@ -101,7 +99,6 @@ class ITKFEM_EXPORT Element2DC0QuadraticTriangularStrain : public Element2DStrai PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element2DC0QuadraticTriangularStrain -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0QuadraticTriangularStrain_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStress.h b/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStress.h index 87cd24ea7e0..d2b7a0e16d9 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStress.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC0QuadraticTriangularStress.h @@ -23,9 +23,7 @@ #include "itkFEMElement2DStress.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC0QuadraticTriangularStress @@ -98,7 +96,6 @@ class ITKFEM_EXPORT Element2DC0QuadraticTriangularStress : public Element2DStres PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element2DC0QuadraticTriangularStress -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC0QuadraticTriangularStress_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DC1Beam.h b/Modules/Numerics/FEM/include/itkFEMElement2DC1Beam.h index c26cac59931..f2087935e9f 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DC1Beam.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DC1Beam.h @@ -24,9 +24,7 @@ #include "itkFEMMaterialLinearElasticity.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DC1Beam @@ -170,7 +168,6 @@ class ITKFEM_EXPORT Element2DC1Beam : public ElementStd<2, 2> */ const MaterialLinearElasticity * m_mat{ nullptr }; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement2DC1Beam_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.h index 7822f6e98a9..b61f3281a41 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DMembrane @@ -129,8 +127,7 @@ class ITK_TEMPLATE_EXPORT Element2DMembrane : public TBaseClass const MaterialLinearElasticity * m_mat{ nullptr }; }; // class Element2DMembrane -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement2DMembrane.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.hxx b/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.hxx index 815e18d4c28..a70df4dcd02 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement2DMembrane.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElement2DMembrane_hxx #define itkFEMElement2DMembrane_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template Element2DMembrane::Element2DMembrane() @@ -102,7 +99,6 @@ Element2DMembrane::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Materials: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DStrain.h b/Modules/Numerics/FEM/include/itkFEMElement2DStrain.h index 973b1267bd0..a994467f238 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DStrain.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DStrain @@ -126,8 +124,7 @@ class ITK_TEMPLATE_EXPORT Element2DStrain : public TBaseClass */ const MaterialLinearElasticity * m_mat{ nullptr }; }; // class Element2DStrain -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement2DStrain.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DStrain.hxx b/Modules/Numerics/FEM/include/itkFEMElement2DStrain.hxx index 72f946a8ebc..0f0bb8b2cd6 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DStrain.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement2DStrain.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElement2DStrain_hxx #define itkFEMElement2DStrain_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template Element2DStrain::Element2DStrain() @@ -102,7 +99,6 @@ Element2DStrain::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Materials: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DStress.h b/Modules/Numerics/FEM/include/itkFEMElement2DStress.h index bf3ce509ff8..9327836fffa 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DStress.h +++ b/Modules/Numerics/FEM/include/itkFEMElement2DStress.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element2DStress @@ -131,8 +129,7 @@ class ITK_TEMPLATE_EXPORT Element2DStress : public TBaseClass } }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement2DStress.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement2DStress.hxx b/Modules/Numerics/FEM/include/itkFEMElement2DStress.hxx index db3afd443cb..7426bc503d4 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement2DStress.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement2DStress.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElement2DStress_hxx #define itkFEMElement2DStress_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template Element2DStress::Element2DStress() @@ -101,7 +98,6 @@ Element2DStress::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Materials: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedron.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedron.h index 6d2ae48e36d..969965d12b3 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedron.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedron.h @@ -22,9 +22,7 @@ #include "itkFEMElementStd.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearHexahedron @@ -121,7 +119,6 @@ class ITKFEM_EXPORT Element3DC0LinearHexahedron : public ElementStd<8, 3> void PopulateEdgeIds() override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearHexahedron_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronMembrane.h index 8dd4f78185c..7ab82675a03 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronMembrane.h @@ -23,9 +23,7 @@ #include "itkFEMElement3DMembrane.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearHexahedronMembrane @@ -80,7 +78,6 @@ class ITKFEM_EXPORT Element3DC0LinearHexahedronMembrane : public Element3DMembra PrintSelf(std::ostream & os, Indent indent) const override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearHexahedronMembrane_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronStrain.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronStrain.h index c8978b72f35..c885db37acb 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearHexahedronStrain.h @@ -23,9 +23,7 @@ #include "itkFEMElement3DStrain.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearHexahedronStrain @@ -80,7 +78,6 @@ class ITKFEM_EXPORT Element3DC0LinearHexahedronStrain : public Element3DStrain #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearTetrahedron @@ -114,7 +112,6 @@ class ITKFEM_EXPORT Element3DC0LinearTetrahedron : public ElementStd<4, 3> void PopulateEdgeIds() override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearTetrahedron_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronMembrane.h index b18992fb57f..472d1142765 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronMembrane.h @@ -23,9 +23,7 @@ #include "itkFEMElement3DMembrane.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearTetrahedronMembrane @@ -79,7 +77,6 @@ class ITKFEM_EXPORT Element3DC0LinearTetrahedronMembrane : public Element3DMembr PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element3DC0LinearTetrahedronMembrane -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearTetrahedronMembrane_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronStrain.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronStrain.h index 697c53f6cfe..aa3e5a26301 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTetrahedronStrain.h @@ -23,9 +23,7 @@ #include "itkFEMElement3DStrain.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearTetrahedronStrain @@ -77,7 +75,6 @@ class ITKFEM_EXPORT Element3DC0LinearTetrahedronStrain : public Element3DStrain< PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element3DC0LinearTetrahedronStrain -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearTetrahedronStrain_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangular.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangular.h index 71a12db8285..9f6e92ca8eb 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangular.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangular.h @@ -22,9 +22,7 @@ #include "itkFEMElementStd.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearTriangular @@ -143,7 +141,6 @@ class ITKFEM_EXPORT Element3DC0LinearTriangular : public ElementStd<3, 3> void PrintSelf(std::ostream & os, Indent indent) const override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearTriangular_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.h index 9d58e66227a..ce8bcbca8fd 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.h @@ -24,9 +24,7 @@ #include "itkFEMElement3DMembrane1DOF.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearTriangularLaplaceBeltrami @@ -87,7 +85,6 @@ class ITKFEM_EXPORT Element3DC0LinearTriangularLaplaceBeltrami PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element3DC0LinearTriangularLaplaceBeltrami -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearTriangularLaplaceBeltrami_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularMembrane.h index 148a137a752..1f18c9d0ad9 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DC0LinearTriangularMembrane.h @@ -24,9 +24,7 @@ #include "itkFEMElement3DMembrane1DOF.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DC0LinearTriangularMembrane @@ -74,7 +72,6 @@ class ITKFEM_EXPORT Element3DC0LinearTriangularMembrane : public Element3DMembra PrintSelf(std::ostream & os, Indent indent) const override; }; // class Element3DC0LinearTriangularMembrane -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElement3DC0LinearTriangularMembrane_h diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.h b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.h index 1d405fe707c..ba695429499 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DMembrane @@ -126,8 +124,7 @@ class ITK_TEMPLATE_EXPORT Element3DMembrane : public TBaseClass const MaterialLinearElasticity * m_mat{ nullptr }; }; // class Element3DMembrane -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement3DMembrane.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.hxx b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.hxx index 3e1532f4c12..65c1b5ff703 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElement3DMembrane_hxx #define itkFEMElement3DMembrane_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template Element3DMembrane::Element3DMembrane() @@ -129,7 +126,6 @@ Element3DMembrane::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Materials: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.h b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.h index 37ceb2d451a..f4acee83059 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DMembrane1DOF @@ -125,8 +123,7 @@ class ITK_TEMPLATE_EXPORT Element3DMembrane1DOF : public TBaseClass MaterialLinearElasticity::ConstPointer m_Mat{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement3DMembrane1DOF.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.hxx b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.hxx index b597115be52..19f18132adb 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement3DMembrane1DOF.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElement3DMembrane1DOF_hxx #define itkFEMElement3DMembrane1DOF_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template Element3DMembrane1DOF::Element3DMembrane1DOF() @@ -89,7 +86,6 @@ Element3DMembrane1DOF::PrintSelf(std::ostream & os, Indent indent) c os << indent << "Materials: " << this->m_Mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DStrain.h b/Modules/Numerics/FEM/include/itkFEMElement3DStrain.h index 74a817dee8f..0114c1a853b 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DStrain.h +++ b/Modules/Numerics/FEM/include/itkFEMElement3DStrain.h @@ -22,9 +22,7 @@ #include "itkFEMElementBase.h" #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element3DStrain @@ -117,8 +115,7 @@ class ITK_TEMPLATE_EXPORT Element3DStrain : public TBaseClass const MaterialLinearElasticity * m_mat{ nullptr }; }; // class Element3DStrain -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElement3DStrain.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElement3DStrain.hxx b/Modules/Numerics/FEM/include/itkFEMElement3DStrain.hxx index c215cd56cf0..53cb94fed78 100644 --- a/Modules/Numerics/FEM/include/itkFEMElement3DStrain.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElement3DStrain.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElement3DStrain_hxx #define itkFEMElement3DStrain_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template Element3DStrain::Element3DStrain() @@ -134,7 +131,6 @@ Element3DStrain::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Materials: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMElementBase.h b/Modules/Numerics/FEM/include/itkFEMElementBase.h index 85bfb7deb0b..8270a427403 100644 --- a/Modules/Numerics/FEM/include/itkFEMElementBase.h +++ b/Modules/Numerics/FEM/include/itkFEMElementBase.h @@ -31,9 +31,7 @@ #include #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Element @@ -723,7 +721,6 @@ class ITKFEM_EXPORT Element : public FEMLightObject PrintSelf(std::ostream & os, Indent indent) const override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMElementBase_h diff --git a/Modules/Numerics/FEM/include/itkFEMElementStd.h b/Modules/Numerics/FEM/include/itkFEMElementStd.h index b382d932409..d9080a807fe 100644 --- a/Modules/Numerics/FEM/include/itkFEMElementStd.h +++ b/Modules/Numerics/FEM/include/itkFEMElementStd.h @@ -21,9 +21,7 @@ #include "itkFEMElementBase.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class ElementStd @@ -159,8 +157,7 @@ class ITK_TEMPLATE_EXPORT ElementStd : public TBaseClass const Node * m_node[NumberOfNodes]{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMElementStd.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMElementStd.hxx b/Modules/Numerics/FEM/include/itkFEMElementStd.hxx index 1914152d7b3..f9e12396402 100644 --- a/Modules/Numerics/FEM/include/itkFEMElementStd.hxx +++ b/Modules/Numerics/FEM/include/itkFEMElementStd.hxx @@ -19,10 +19,7 @@ #ifndef itkFEMElementStd_hxx #define itkFEMElementStd_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template ElementStd::ElementStd() @@ -46,7 +43,6 @@ ElementStd::PrintSelf(st } } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMException.h b/Modules/Numerics/FEM/include/itkFEMException.h index 1b6f4a1f94c..d758f8bc81f 100644 --- a/Modules/Numerics/FEM/include/itkFEMException.h +++ b/Modules/Numerics/FEM/include/itkFEMException.h @@ -23,9 +23,7 @@ #include "itkMacro.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \file itkFEMException.h @@ -166,7 +164,6 @@ class ITK_ABI_EXPORT FEMExceptionSolution : public FEMException /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(FEMExceptionSolution); }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMException_h diff --git a/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.h b/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.h index 9ff99d0933a..c2b4f683781 100644 --- a/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.h +++ b/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.h @@ -36,9 +36,7 @@ #include #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class ImageMetricLoad @@ -378,8 +376,7 @@ class ITK_TEMPLATE_EXPORT ImageMetricLoad : public LoadElement private: }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMImageMetricLoad.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx b/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx index 26400d609c5..8a84f3adccb 100644 --- a/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx +++ b/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx @@ -18,10 +18,7 @@ #ifndef itkFEMImageMetricLoad_hxx #define itkFEMImageMetricLoad_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. template @@ -837,7 +834,6 @@ ImageMetricLoad::PrintSelf(std::ostream & os, Indent indent) co os << indent << "Energy: " << this->m_Energy << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMItpackSparseMatrix.h b/Modules/Numerics/FEM/include/itkFEMItpackSparseMatrix.h index f7b6272302f..a8aa5d1d413 100644 --- a/Modules/Numerics/FEM/include/itkFEMItpackSparseMatrix.h +++ b/Modules/Numerics/FEM/include/itkFEMItpackSparseMatrix.h @@ -22,9 +22,7 @@ #include "itkFEMException.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class ItpackSparseMatrix @@ -347,7 +345,6 @@ class ITK_ABI_EXPORT FEMExceptionItpackSparseMatrixSbsij : public FEMException /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(FEMExceptionItpackSparseMatrixSbsij); }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMItpackSparseMatrix_h diff --git a/Modules/Numerics/FEM/include/itkFEMLightObject.h b/Modules/Numerics/FEM/include/itkFEMLightObject.h index cae98a8a391..4579f2055ad 100644 --- a/Modules/Numerics/FEM/include/itkFEMLightObject.h +++ b/Modules/Numerics/FEM/include/itkFEMLightObject.h @@ -28,9 +28,7 @@ #include "itkFEMException.h" #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class FEMLightObject @@ -99,7 +97,6 @@ class ITKFEM_EXPORT FEMLightObject : public itk::LightObject */ int m_GlobalNumber{ -1 }; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLightObject_h diff --git a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapper.h b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapper.h index 6230c6b8eca..7a1eacb6a4c 100644 --- a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapper.h +++ b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapper.h @@ -28,9 +28,7 @@ #include #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LinearSystemWrapper @@ -585,7 +583,6 @@ class ITK_ABI_EXPORT FEMExceptionLinearSystemBounds : public FEMException /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(FEMExceptionLinearSystemBounds); }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLinearSystemWrapper_h diff --git a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperDenseVNL.h b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperDenseVNL.h index 435a368d650..df05d0eb4db 100644 --- a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperDenseVNL.h +++ b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperDenseVNL.h @@ -26,9 +26,7 @@ #include "ITKFEMExport.h" #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LinearSystemWrapperDenseVNL @@ -181,7 +179,6 @@ class ITKFEM_EXPORT LinearSystemWrapperDenseVNL : public LinearSystemWrapper /** vector of pointers to VNL vectors */ std::vector *> * m_Solutions{ nullptr }; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLinearSystemWrapperDenseVNL_h diff --git a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperItpack.h b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperItpack.h index 06ce05c578c..8575b1c1c8d 100644 --- a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperItpack.h +++ b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperItpack.h @@ -46,9 +46,7 @@ extern "C" integer *); } -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LinearSystemWrapperItpack @@ -778,7 +776,6 @@ class ITK_ABI_EXPORT FEMExceptionItpackSolver : public FEMException /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(FEMExceptionItpackSolver); }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLinearSystemWrapperItpack_h diff --git a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperVNL.h b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperVNL.h index c00a292c00d..1e6a5755c5d 100644 --- a/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperVNL.h +++ b/Modules/Numerics/FEM/include/itkFEMLinearSystemWrapperVNL.h @@ -25,9 +25,7 @@ #include #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LinearSystemWrapperVNL @@ -175,7 +173,6 @@ class ITKFEM_EXPORT LinearSystemWrapperVNL : public LinearSystemWrapper /** vector of pointers to VNL vectors */ std::vector *> * m_Solutions{ nullptr }; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLinearSystemWrapperVNL_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadBC.h b/Modules/Numerics/FEM/include/itkFEMLoadBC.h index 59f6a28210d..a68b61f36a9 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadBC.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadBC.h @@ -21,9 +21,7 @@ #include "itkFEMLoadBase.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadBC @@ -92,7 +90,6 @@ class ITKFEM_EXPORT LoadBC : public Load */ vnl_vector m_Value{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadBC_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadBCMFC.h b/Modules/Numerics/FEM/include/itkFEMLoadBCMFC.h index 92429148932..7151f7cad7b 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadBCMFC.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadBCMFC.h @@ -23,9 +23,7 @@ #include "itkFEMLoadBase.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadBCMFC @@ -198,7 +196,6 @@ class ITKFEM_EXPORT LoadBCMFC : public Load */ vnl_vector m_RightHandSide{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadBCMFC_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadBase.h b/Modules/Numerics/FEM/include/itkFEMLoadBase.h index 07623622f1d..a23b952a65c 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadBase.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadBase.h @@ -23,9 +23,7 @@ #include "itkFEMPArray.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Load @@ -101,7 +99,6 @@ class ITKFEM_EXPORT Load : public FEMLightObject */ Element::ConstPointer m_Element{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadBase_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadEdge.h b/Modules/Numerics/FEM/include/itkFEMLoadEdge.h index fa3c05250fd..254041d667d 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadEdge.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadEdge.h @@ -23,9 +23,7 @@ #include "ITKFEMExport.h" #include "vnl/vnl_matrix.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadEdge @@ -115,7 +113,6 @@ class ITKFEM_EXPORT LoadEdge : public LoadElement */ vnl_matrix m_Force{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadEdge_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadElementBase.h b/Modules/Numerics/FEM/include/itkFEMLoadElementBase.h index 9336eca2948..60a4ef16ea3 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadElementBase.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadElementBase.h @@ -22,9 +22,7 @@ #include "itkFEMLoadBase.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadElement @@ -119,7 +117,6 @@ class ITKFEM_EXPORT LoadElement : public Load ElementPointersVectorType m_Element{}; /** pointers to element objects on which the load acts */ }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadElementBase_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadGrav.h b/Modules/Numerics/FEM/include/itkFEMLoadGrav.h index 53da6eec8ae..4aca0d0853d 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadGrav.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadGrav.h @@ -23,9 +23,7 @@ #include "ITKFEMExport.h" #include "vnl/vnl_vector.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadGrav @@ -110,7 +108,6 @@ class ITKFEM_EXPORT LoadGravConst : public LoadGrav vnl_vector m_GravityForce{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadGrav_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadLandmark.h b/Modules/Numerics/FEM/include/itkFEMLoadLandmark.h index f51a7148333..087752632c6 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadLandmark.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadLandmark.h @@ -24,9 +24,7 @@ #include "vnl/vnl_vector.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadLandmark @@ -281,7 +279,7 @@ class ITKFEM_EXPORT LoadLandmark : public LoadElement Solution::ConstPointer m_Solution{ nullptr }; }; -} // namespace fem -} // namespace itk +} // namespace itk::fem + #endif // itkFEMLoadLandmark_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadNode.h b/Modules/Numerics/FEM/include/itkFEMLoadNode.h index dada7eaa8c3..956e2739080 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadNode.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadNode.h @@ -25,9 +25,7 @@ #include "ITKFEMExport.h" #include "vnl/vnl_vector.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadNode @@ -110,7 +108,6 @@ class ITKFEM_EXPORT LoadNode : public Load */ vnl_vector m_Force{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadNode_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h b/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h index 8ef2b8dedf5..c107b9e177f 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadNoisyLandmark.h @@ -22,9 +22,7 @@ #include "itkFEMLoadLandmark.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class FEMLoadNoisyLandmark @@ -239,7 +237,6 @@ class ITKFEM_EXPORT LoadNoisyLandmark : public LoadLandmark */ MatrixType m_LandmarkTensor{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadNoisyLandmark_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadPoint.h b/Modules/Numerics/FEM/include/itkFEMLoadPoint.h index d1b4f73cfd8..a9717834634 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadPoint.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadPoint.h @@ -23,9 +23,7 @@ #include "ITKFEMExport.h" #include "vnl/vnl_vector.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadPoint @@ -92,7 +90,6 @@ class ITKFEM_EXPORT LoadPoint : public LoadElement /** The actual load vector. */ vnl_vector m_ForcePoint{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadPoint_h diff --git a/Modules/Numerics/FEM/include/itkFEMLoadTest.h b/Modules/Numerics/FEM/include/itkFEMLoadTest.h index 11a65eb905b..47653fe6c41 100644 --- a/Modules/Numerics/FEM/include/itkFEMLoadTest.h +++ b/Modules/Numerics/FEM/include/itkFEMLoadTest.h @@ -21,9 +21,7 @@ #include "itkFEMLoadElementBase.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class LoadTest @@ -80,7 +78,6 @@ class LoadTest : public LoadElement private: }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMLoadTest_h diff --git a/Modules/Numerics/FEM/include/itkFEMMaterialBase.h b/Modules/Numerics/FEM/include/itkFEMMaterialBase.h index c05412f249c..c4ddf73fc48 100644 --- a/Modules/Numerics/FEM/include/itkFEMMaterialBase.h +++ b/Modules/Numerics/FEM/include/itkFEMMaterialBase.h @@ -23,9 +23,7 @@ #include "itkFEMPArray.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Material @@ -64,7 +62,6 @@ class ITKFEM_EXPORT Material : public FEMLightObject void PrintSelf(std::ostream & os, Indent indent) const override; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMMaterialBase_h diff --git a/Modules/Numerics/FEM/include/itkFEMMaterialLinearElasticity.h b/Modules/Numerics/FEM/include/itkFEMMaterialLinearElasticity.h index 7757b36ea5e..fe48beef6af 100644 --- a/Modules/Numerics/FEM/include/itkFEMMaterialLinearElasticity.h +++ b/Modules/Numerics/FEM/include/itkFEMMaterialLinearElasticity.h @@ -22,9 +22,7 @@ #include "itkFEMMaterialBase.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class MaterialLinearElasticity @@ -172,7 +170,6 @@ class ITKFEM_EXPORT MaterialLinearElasticity : public Material */ double m_DensityHeatCapacity{ 1.0 }; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMMaterialLinearElasticity_h diff --git a/Modules/Numerics/FEM/include/itkFEMObject.h b/Modules/Numerics/FEM/include/itkFEMObject.h index 163d967320f..3631228aa8e 100644 --- a/Modules/Numerics/FEM/include/itkFEMObject.h +++ b/Modules/Numerics/FEM/include/itkFEMObject.h @@ -35,9 +35,7 @@ #include "itkVectorContainer.h" #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** \class FEMObject * \brief Implements N-dimensional Finite element (FE) models including @@ -390,8 +388,8 @@ class ITK_TEMPLATE_EXPORT FEMObject : public DataObject AddNextLoadInternal(Load * l); }; -} // namespace fem -} // namespace itk +} // namespace itk::fem + #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMObject.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMObject.hxx b/Modules/Numerics/FEM/include/itkFEMObject.hxx index 34e9580d78f..5da028ed3f0 100644 --- a/Modules/Numerics/FEM/include/itkFEMObject.hxx +++ b/Modules/Numerics/FEM/include/itkFEMObject.hxx @@ -32,9 +32,7 @@ #include -namespace itk -{ -namespace fem +namespace itk::fem { template @@ -645,7 +643,6 @@ FEMObject::PrintSelf(std::ostream & os, Indent indent) const os << indent << "MaterialContainer: " << this->m_MaterialContainer << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMObject_hxx diff --git a/Modules/Numerics/FEM/include/itkFEMP.h b/Modules/Numerics/FEM/include/itkFEMP.h index 5374a7e901c..d91d1eac3cf 100644 --- a/Modules/Numerics/FEM/include/itkFEMP.h +++ b/Modules/Numerics/FEM/include/itkFEMP.h @@ -22,9 +22,7 @@ #include #include "itkMacro.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class FEMP @@ -165,7 +163,6 @@ FEMP::operator=(const FEMP & rhs) return *this; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMP_h diff --git a/Modules/Numerics/FEM/include/itkFEMPArray.h b/Modules/Numerics/FEM/include/itkFEMPArray.h index 93cccf3b14f..1cd478004ee 100644 --- a/Modules/Numerics/FEM/include/itkFEMPArray.h +++ b/Modules/Numerics/FEM/include/itkFEMPArray.h @@ -23,9 +23,7 @@ #include "itkFEMException.h" #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class FEMPArray @@ -180,7 +178,6 @@ FEMPArray::Renumber() return j; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMPArray_h diff --git a/Modules/Numerics/FEM/include/itkFEMRobustSolver.h b/Modules/Numerics/FEM/include/itkFEMRobustSolver.h index b4589ff3826..42a89e51c6e 100644 --- a/Modules/Numerics/FEM/include/itkFEMRobustSolver.h +++ b/Modules/Numerics/FEM/include/itkFEMRobustSolver.h @@ -29,9 +29,7 @@ #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class FEMRobustSolver @@ -373,8 +371,7 @@ class CompareLandmarkDisplacementError } }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMRobustSolver.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMRobustSolver.hxx b/Modules/Numerics/FEM/include/itkFEMRobustSolver.hxx index f881415f39e..8f6f8fcfde0 100644 --- a/Modules/Numerics/FEM/include/itkFEMRobustSolver.hxx +++ b/Modules/Numerics/FEM/include/itkFEMRobustSolver.hxx @@ -26,9 +26,7 @@ #include "itkFEMLoadLandmark.h" #include "itkMath.h" -namespace itk -{ -namespace fem +namespace itk::fem { template @@ -1052,7 +1050,6 @@ RobustSolver::InitializeInterpolationGrid() } // next element } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.h b/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.h index 2f9ee80b2ee..12fa68b163d 100644 --- a/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.h +++ b/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.h @@ -38,9 +38,7 @@ #include "itkQuadrilateralCell.h" #include "itkHexahedronCell.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** \class FEMScatteredDataPointSetToImageFilter * \brief Scattered data approximation to interpolation @@ -303,8 +301,7 @@ class ITK_TEMPLATE_EXPORT FEMScatteredDataPointSetToImageFilter MaterialPointerType m_Material{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMScatteredDataPointSetToImageFilter.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.hxx b/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.hxx index dc0bd1b9508..0d419e330a5 100644 --- a/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.hxx +++ b/Modules/Numerics/FEM/include/itkFEMScatteredDataPointSetToImageFilter.hxx @@ -30,9 +30,7 @@ #include "vnl/vnl_vector.h" #include -namespace itk -{ -namespace fem +namespace itk::fem { template m_Direction << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMSolution.h b/Modules/Numerics/FEM/include/itkFEMSolution.h index 20288774345..3529521fa8f 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolution.h +++ b/Modules/Numerics/FEM/include/itkFEMSolution.h @@ -21,9 +21,7 @@ #include "ITKFEMExport.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Solution @@ -72,7 +70,6 @@ class ITKFEM_EXPORT Solution */ virtual ~Solution(); }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMSolution_h diff --git a/Modules/Numerics/FEM/include/itkFEMSolver.h b/Modules/Numerics/FEM/include/itkFEMSolver.h index e121b01daf3..57eb4a562e3 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolver.h +++ b/Modules/Numerics/FEM/include/itkFEMSolver.h @@ -27,9 +27,7 @@ #include "itkImage.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class Solver @@ -440,8 +438,7 @@ class ITK_TEMPLATE_EXPORT Solver : public ProcessObject InterpolationGridSpacingType m_Spacing{}; InterpolationGridDirectionType m_Direction{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMSolver.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMSolver.hxx b/Modules/Numerics/FEM/include/itkFEMSolver.hxx index c9157a79ea3..5a2ac3b94b6 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolver.hxx +++ b/Modules/Numerics/FEM/include/itkFEMSolver.hxx @@ -31,9 +31,7 @@ #include #include "itkMath.h" -namespace itk -{ -namespace fem +namespace itk::fem { template @@ -919,7 +917,6 @@ Solver::GetElementAtPoint(const VectorType & pt) const } } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h index 829af183104..5d2c0c916ae 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h +++ b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h @@ -33,9 +33,7 @@ #include #include -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class SolverCrankNicolson @@ -276,8 +274,7 @@ class ITK_TEMPLATE_EXPORT SolverCrankNicolson : public Solver unsigned int m_SumMatrixIndex{}; unsigned int m_DiffMatrixBySolutionTMinus1Index{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMSolverCrankNicolson.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx index b965cd8c034..854f581492b 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx +++ b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx @@ -26,9 +26,7 @@ #include "itkFEMLoadLandmark.h" #include "itkMath.h" -namespace itk -{ -namespace fem +namespace itk::fem { #define TOTE @@ -882,7 +880,6 @@ SolverCrankNicolson::PrintForce() } } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.h b/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.h index 5aa1b121b78..18a83ac44d6 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.h +++ b/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.h @@ -21,9 +21,7 @@ #include "itkFEMSolver.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** @@ -155,8 +153,7 @@ class ITK_TEMPLATE_EXPORT SolverHyperbolic : public Solver unsigned int m_NumberOfIterations{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMSolverHyperbolic.hxx" diff --git a/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.hxx b/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.hxx index c76edf02487..7e881fecfa6 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.hxx +++ b/Modules/Numerics/FEM/include/itkFEMSolverHyperbolic.hxx @@ -21,9 +21,7 @@ #include "itkMath.h" -namespace itk -{ -namespace fem +namespace itk::fem { template @@ -238,7 +236,6 @@ SolverHyperbolic::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Gamma: " << this->m_Gamma << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Numerics/FEM/include/itkFEMUtility.h b/Modules/Numerics/FEM/include/itkFEMUtility.h index c03c1db1c1f..8585c421bb2 100644 --- a/Modules/Numerics/FEM/include/itkFEMUtility.h +++ b/Modules/Numerics/FEM/include/itkFEMUtility.h @@ -25,9 +25,7 @@ class MetaObject; -namespace itk -{ -namespace fem +namespace itk::fem { /** * \file itkFEMUtility.h @@ -275,7 +273,6 @@ class ITKFEM_EXPORT GaussIntegrate Integrate(double (*f)(double), double a, double b, int n = 3); }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkFEMUtility_h diff --git a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h index 7c46ea93673..93471fd8b59 100644 --- a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h +++ b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h @@ -23,9 +23,7 @@ #include "itkFEMObject.h" #include "itkProcessObject.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * \class ImageToRectilinearFEMObjectFilter @@ -171,8 +169,7 @@ class ITK_TEMPLATE_EXPORT ImageToRectilinearFEMObjectFilter : public ProcessObje MaterialPointerType m_Material{}; ElementBasePointerType m_Element{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkImageToRectilinearFEMObjectFilter.hxx" diff --git a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.hxx b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.hxx index 708f15a825e..2af8dc31d3e 100644 --- a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.hxx +++ b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.hxx @@ -21,9 +21,8 @@ #include "itkFEMElement2DC0LinearQuadrilateral.h" #include "itkFEMElement3DC0LinearHexahedron.h" #include -namespace itk -{ -namespace fem + +namespace itk::fem { template @@ -303,6 +302,5 @@ ImageToRectilinearFEMObjectFilter::PrintSelf(std::ostream & os, Ind itkPrintSelfObjectMacro(Element); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif // itkImageToRectilinearFEMObjectFilter_hxx diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLine.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLine.cxx index 388781d6a90..e21ccbea641 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLine.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLine.cxx @@ -19,9 +19,7 @@ #include "itkFEMElement2DC0LinearLine.h" #include // For abs. -namespace itk -{ -namespace fem +namespace itk::fem { void Element2DC0LinearLine::GetIntegrationPointAndWeight(unsigned int i, @@ -199,5 +197,4 @@ Element2DC0LinearLine::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLineStress.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLineStress.cxx index bb6e8621820..71e982729eb 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLineStress.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearLineStress.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearLineStress.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -89,5 +87,4 @@ Element2DC0LinearLineStress::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateral.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateral.cxx index 7bc26e31384..e2144e3b057 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateral.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateral.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearQuadrilateral.h" -namespace itk -{ -namespace fem +namespace itk::fem { void Element2DC0LinearQuadrilateral::GetIntegrationPointAndWeight(unsigned int i, @@ -240,5 +238,4 @@ Element2DC0LinearQuadrilateral::PrintSelf(std::ostream & os, Indent indent) cons Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralMembrane.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralMembrane.cxx index 866f34db0af..10750cc790d 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralMembrane.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralMembrane.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearQuadrilateralMembrane.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -78,5 +76,4 @@ Element2DC0LinearQuadrilateralMembrane::PrintSelf(std::ostream & os, Indent inde Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStrain.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStrain.cxx index be3a2193c19..9b19f84058f 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStrain.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStrain.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearQuadrilateralStrain.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -80,5 +78,4 @@ Element2DC0LinearQuadrilateralStrain::PrintSelf(std::ostream & os, Indent indent Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStress.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStress.cxx index ba42e4e11f7..14f02c6989b 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStress.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearQuadrilateralStress.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearQuadrilateralStress.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -80,5 +78,4 @@ Element2DC0LinearQuadrilateralStress::PrintSelf(std::ostream & os, Indent indent Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangular.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangular.cxx index 53008f9adfa..c3307c63763 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangular.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangular.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearTriangular.h" -namespace itk -{ -namespace fem +namespace itk::fem { const double Element2DC0LinearTriangular::trigGaussRuleInfo[6][7][4] = { { // order=0, never used @@ -237,5 +235,4 @@ Element2DC0LinearTriangular::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularMembrane.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularMembrane.cxx index 28047a1a29c..9b9d44134b4 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularMembrane.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularMembrane.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearTriangularMembrane.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -75,5 +73,4 @@ Element2DC0LinearTriangularMembrane::PrintSelf(std::ostream & os, Indent indent) Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStrain.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStrain.cxx index cbbc670ef08..c9d7792eeb7 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStrain.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStrain.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearTriangularStrain.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -75,5 +73,4 @@ Element2DC0LinearTriangularStrain::PrintSelf(std::ostream & os, Indent indent) c Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStress.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStress.cxx index 4ac244c2f73..9d6c8e55865 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStress.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0LinearTriangularStress.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0LinearTriangularStress.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -75,5 +73,4 @@ Element2DC0LinearTriangularStress::PrintSelf(std::ostream & os, Indent indent) c Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangular.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangular.cxx index 9e5ffd8e47b..c8627b6253f 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangular.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangular.cxx @@ -20,9 +20,7 @@ #include "itkFEMElement2DC0LinearTriangularMembrane.h" -namespace itk -{ -namespace fem +namespace itk::fem { void Element2DC0QuadraticTriangular::GetIntegrationPointAndWeight(unsigned int i, @@ -246,5 +244,4 @@ Element2DC0QuadraticTriangular::PrintSelf(std::ostream & os, Indent indent) cons Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStrain.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStrain.cxx index b0afecf1d66..178ed8e9538 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStrain.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStrain.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0QuadraticTriangularStrain.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -84,5 +82,4 @@ Element2DC0QuadraticTriangularStrain::PrintSelf(std::ostream & os, Indent indent Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStress.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStress.cxx index f5e37939b07..0c56f09ed17 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStress.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC0QuadraticTriangularStress.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC0QuadraticTriangularStress.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -84,5 +82,4 @@ Element2DC0QuadraticTriangularStress::PrintSelf(std::ostream & os, Indent indent Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement2DC1Beam.cxx b/Modules/Numerics/FEM/src/itkFEMElement2DC1Beam.cxx index 464bf0d28aa..a692bdf6911 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement2DC1Beam.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement2DC1Beam.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement2DC1Beam.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -348,5 +346,4 @@ Element2DC1Beam::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Materials: " << this->m_mat << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx index 99a411883ec..02065d524c4 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx @@ -19,9 +19,7 @@ #include "itkFEMElement3DC0LinearHexahedron.h" #include "itkMath.h" -namespace itk -{ -namespace fem +namespace itk::fem { void Element3DC0LinearHexahedron::GetIntegrationPointAndWeight(unsigned int i, @@ -430,5 +428,4 @@ Element3DC0LinearHexahedron::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronMembrane.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronMembrane.cxx index b7a7bf0b319..3a6597700a9 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronMembrane.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronMembrane.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearHexahedronMembrane.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method itk::LightObject::Pointer @@ -78,5 +76,4 @@ Element3DC0LinearHexahedronMembrane::PrintSelf(std::ostream & os, Indent indent) Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronStrain.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronStrain.cxx index 98c7c6ac4a2..1e1f3f6286a 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronStrain.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedronStrain.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearHexahedronStrain.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method itk::LightObject::Pointer @@ -78,5 +76,4 @@ Element3DC0LinearHexahedronStrain::PrintSelf(std::ostream & os, Indent indent) c Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedron.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedron.cxx index 7e9324155a4..ef46d41fd5e 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedron.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedron.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearTetrahedron.h" -namespace itk -{ -namespace fem +namespace itk::fem { void @@ -202,5 +200,4 @@ Element3DC0LinearTetrahedron::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronMembrane.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronMembrane.cxx index 10a2cd9df61..05fbf7e6e23 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronMembrane.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronMembrane.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearTetrahedronMembrane.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method itk::LightObject::Pointer @@ -73,5 +71,4 @@ Element3DC0LinearTetrahedronMembrane::PrintSelf(std::ostream & os, Indent indent Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronStrain.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronStrain.cxx index e0c9fc0b405..ff850cdaaf0 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronStrain.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTetrahedronStrain.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearTetrahedronStrain.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method itk::LightObject::Pointer @@ -74,5 +72,4 @@ Element3DC0LinearTetrahedronStrain::PrintSelf(std::ostream & os, Indent indent) Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx index 370133f6ac5..16ce856ef24 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx @@ -22,9 +22,7 @@ #include "vnl/algo/vnl_qr.h" -namespace itk -{ -namespace fem +namespace itk::fem { const Element3DC0LinearTriangular::Float Element3DC0LinearTriangular::trigGaussRuleInfo[6][7][4] = { { // order=0, never used @@ -379,5 +377,4 @@ Element3DC0LinearTriangular::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx index 83bdc3104dd..eb0532d8351 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearTriangularLaplaceBeltrami.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method itk::LightObject::Pointer @@ -300,5 +298,4 @@ Element3DC0LinearTriangularLaplaceBeltrami::PrintSelf(std::ostream & os, Indent Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularMembrane.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularMembrane.cxx index cf5e23a0e15..6584bec7cb2 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularMembrane.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularMembrane.cxx @@ -18,9 +18,7 @@ #include "itkFEMElement3DC0LinearTriangularMembrane.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method @@ -166,5 +164,4 @@ Element3DC0LinearTriangularMembrane::PrintSelf(std::ostream & os, Indent indent) Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMElementBase.cxx b/Modules/Numerics/FEM/src/itkFEMElementBase.cxx index bde925d6ed3..216d9629660 100644 --- a/Modules/Numerics/FEM/src/itkFEMElementBase.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElementBase.cxx @@ -19,9 +19,7 @@ #include "itkFEMElementBase.h" #include "vnl/algo/vnl_qr.h" -namespace itk -{ -namespace fem +namespace itk::fem { // //////////////////////////////////////////////////////////////////////// @@ -540,5 +538,4 @@ Element::GetEdgeIds() const return this->m_EdgeIds; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMException.cxx b/Modules/Numerics/FEM/src/itkFEMException.cxx index 3a1ea18b57f..7cbcef388d9 100644 --- a/Modules/Numerics/FEM/src/itkFEMException.cxx +++ b/Modules/Numerics/FEM/src/itkFEMException.cxx @@ -20,9 +20,7 @@ #include -namespace itk -{ -namespace fem +namespace itk::fem { FEMException::FEMException(std::string file, unsigned int lineNumber, std::string location) : ExceptionObject(std::move(file), lineNumber, "Unhandled exception in FEM class!", std::move(location)) @@ -76,5 +74,4 @@ FEMExceptionSolution::FEMExceptionSolution(std::string file, FEMExceptionSolution::~FEMExceptionSolution() noexcept = default; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMItpackSparseMatrix.cxx b/Modules/Numerics/FEM/src/itkFEMItpackSparseMatrix.cxx index 88fdeecf34f..83d62cf6bfd 100644 --- a/Modules/Numerics/FEM/src/itkFEMItpackSparseMatrix.cxx +++ b/Modules/Numerics/FEM/src/itkFEMItpackSparseMatrix.cxx @@ -18,9 +18,7 @@ #include "itkFEMItpackSparseMatrix.h" #include "itpack.h" -namespace itk -{ -namespace fem +namespace itk::fem { ItpackSparseMatrix::ItpackSparseMatrix() : m_MatrixFinalized(0) @@ -488,5 +486,4 @@ FEMExceptionItpackSparseMatrixSbsij::FEMExceptionItpackSparseMatrixSbsij(std::st FEMExceptionItpackSparseMatrixSbsij::~FEMExceptionItpackSparseMatrixSbsij() noexcept = default; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLightObject.cxx b/Modules/Numerics/FEM/src/itkFEMLightObject.cxx index 07d7e138424..6f3ff517c95 100644 --- a/Modules/Numerics/FEM/src/itkFEMLightObject.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLightObject.cxx @@ -18,9 +18,7 @@ #include "itkFEMLightObject.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * Here we just read the global number from the stream. @@ -46,5 +44,4 @@ FEMLightObject::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Global Number: " << this->m_GlobalNumber << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapper.cxx b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapper.cxx index 2e7147c2262..689f7a51c1b 100644 --- a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapper.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapper.cxx @@ -18,9 +18,7 @@ #include "itkFEMLinearSystemWrapper.h" -namespace itk -{ -namespace fem +namespace itk::fem { LinearSystemWrapper::~LinearSystemWrapper() = default; @@ -436,5 +434,4 @@ FEMExceptionLinearSystemBounds::FEMExceptionLinearSystemBounds(std::string file FEMExceptionLinearSystemBounds::~FEMExceptionLinearSystemBounds() noexcept = default; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperDenseVNL.cxx b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperDenseVNL.cxx index bca15852ab1..7a4da10d054 100644 --- a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperDenseVNL.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperDenseVNL.cxx @@ -18,9 +18,7 @@ #include "itkFEMLinearSystemWrapperDenseVNL.h" -namespace itk -{ -namespace fem +namespace itk::fem { void LinearSystemWrapperDenseVNL::InitializeMatrix(unsigned int matrixIndex) @@ -288,5 +286,4 @@ LinearSystemWrapperDenseVNL::~LinearSystemWrapperDenseVNL() delete m_Solutions; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperItpack.cxx b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperItpack.cxx index 0ea8be049b3..1d6452ba7f0 100644 --- a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperItpack.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperItpack.cxx @@ -19,9 +19,7 @@ #include "itpack.h" #include "itkFEMLinearSystemWrapperItpack.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** * constructor @@ -1073,5 +1071,4 @@ FEMExceptionItpackSolver::FEMExceptionItpackSolver(std::string file, SetDescription(buf.str().c_str()); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperVNL.cxx b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperVNL.cxx index 510d797ec29..2348c129f75 100644 --- a/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperVNL.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLinearSystemWrapperVNL.cxx @@ -20,9 +20,7 @@ #include #include -namespace itk -{ -namespace fem +namespace itk::fem { void LinearSystemWrapperVNL::InitializeMatrix(unsigned int matrixIndex) @@ -312,5 +310,4 @@ LinearSystemWrapperVNL::~LinearSystemWrapperVNL() delete m_Solutions; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadBC.cxx b/Modules/Numerics/FEM/src/itkFEMLoadBC.cxx index d09e277599e..c848217aa28 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadBC.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadBC.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadBC.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. @@ -74,5 +72,4 @@ LoadBC::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Degree Of Freedom: " << this->m_DegreeOfFreedom << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadBCMFC.cxx b/Modules/Numerics/FEM/src/itkFEMLoadBCMFC.cxx index b74142e37e2..99fbe9ac22d 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadBCMFC.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadBCMFC.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadBCMFC.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. itk::LightObject::Pointer @@ -147,5 +145,4 @@ LoadBCMFC::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Right HandSide: " << this->m_RightHandSide << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadBase.cxx b/Modules/Numerics/FEM/src/itkFEMLoadBase.cxx index 359012507d0..44ce983b530 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadBase.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadBase.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadBase.h" -namespace itk -{ -namespace fem +namespace itk::fem { void @@ -29,5 +27,4 @@ Load::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadEdge.cxx b/Modules/Numerics/FEM/src/itkFEMLoadEdge.cxx index 6f67c0e2718..c7b8ae9a446 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadEdge.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadEdge.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadEdge.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. @@ -117,5 +115,4 @@ LoadEdge::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Force: " << this->m_Force << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadElementBase.cxx b/Modules/Numerics/FEM/src/itkFEMLoadElementBase.cxx index beae4c76878..d37fa274e9b 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadElementBase.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadElementBase.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadElementBase.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method @@ -70,5 +68,4 @@ LoadElement::PrintSelf(std::ostream & os, Indent indent) const } } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadGrav.cxx b/Modules/Numerics/FEM/src/itkFEMLoadGrav.cxx index 2d36635e053..007b663b142 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadGrav.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadGrav.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadGrav.h" -namespace itk -{ -namespace fem +namespace itk::fem { void @@ -133,5 +131,4 @@ LoadGravConst::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Gravity Force: " << this->m_GravityForce << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadLandmark.cxx b/Modules/Numerics/FEM/src/itkFEMLoadLandmark.cxx index 75339011b45..61edf8b9a08 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadLandmark.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadLandmark.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadLandmark.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. @@ -194,5 +192,4 @@ LoadLandmark::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Solution: " << this->m_Solution << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadNode.cxx b/Modules/Numerics/FEM/src/itkFEMLoadNode.cxx index b72ecf62b43..36b9b15f0cc 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadNode.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadNode.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadNode.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method. @@ -73,5 +71,4 @@ LoadNode::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Force: " << this->m_Force << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadNoisyLandmark.cxx b/Modules/Numerics/FEM/src/itkFEMLoadNoisyLandmark.cxx index 8100f01141f..67eeeb24ca9 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadNoisyLandmark.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadNoisyLandmark.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadNoisyLandmark.h" -namespace itk -{ -namespace fem +namespace itk::fem { void @@ -40,5 +38,4 @@ LoadNoisyLandmark::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Landmark Tensor: " << this->m_LandmarkTensor << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMLoadPoint.cxx b/Modules/Numerics/FEM/src/itkFEMLoadPoint.cxx index b740bdecba1..c43c54e32c4 100644 --- a/Modules/Numerics/FEM/src/itkFEMLoadPoint.cxx +++ b/Modules/Numerics/FEM/src/itkFEMLoadPoint.cxx @@ -18,9 +18,7 @@ #include "itkFEMLoadPoint.h" -namespace itk -{ -namespace fem +namespace itk::fem { itk::LightObject::Pointer @@ -99,5 +97,4 @@ LoadPoint::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Force Point: " << this->m_ForcePoint << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMMaterialBase.cxx b/Modules/Numerics/FEM/src/itkFEMMaterialBase.cxx index 7d61f56be1f..d391562cd99 100644 --- a/Modules/Numerics/FEM/src/itkFEMMaterialBase.cxx +++ b/Modules/Numerics/FEM/src/itkFEMMaterialBase.cxx @@ -18,9 +18,7 @@ #include "itkFEMMaterialBase.h" -namespace itk -{ -namespace fem +namespace itk::fem { void @@ -29,5 +27,4 @@ Material::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMMaterialLinearElasticity.cxx b/Modules/Numerics/FEM/src/itkFEMMaterialLinearElasticity.cxx index 328d9210136..71b283045c6 100644 --- a/Modules/Numerics/FEM/src/itkFEMMaterialLinearElasticity.cxx +++ b/Modules/Numerics/FEM/src/itkFEMMaterialLinearElasticity.cxx @@ -18,9 +18,7 @@ #include "itkFEMMaterialLinearElasticity.h" -namespace itk -{ -namespace fem +namespace itk::fem { // Overload the CreateAnother() method itk::LightObject::Pointer @@ -131,5 +129,4 @@ MaterialLinearElasticity::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Density Heat Capacity: " << this->m_DensityHeatCapacity << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMSolution.cxx b/Modules/Numerics/FEM/src/itkFEMSolution.cxx index e32b712d652..c09e2506ad5 100644 --- a/Modules/Numerics/FEM/src/itkFEMSolution.cxx +++ b/Modules/Numerics/FEM/src/itkFEMSolution.cxx @@ -17,12 +17,9 @@ *=========================================================================*/ #include "itkFEMSolution.h" -namespace itk -{ -namespace fem +namespace itk::fem { Solution::~Solution() = default; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/FEM/src/itkFEMUtility.cxx b/Modules/Numerics/FEM/src/itkFEMUtility.cxx index e630341f239..ce2742bbd18 100644 --- a/Modules/Numerics/FEM/src/itkFEMUtility.cxx +++ b/Modules/Numerics/FEM/src/itkFEMUtility.cxx @@ -18,9 +18,7 @@ #include "itkFEMUtility.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** @@ -74,5 +72,4 @@ GaussIntegrate::Integrate(double (*f)(double), double a, double b, int n) return scale * sum; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem diff --git a/Modules/Numerics/Optimizersv4/include/itkConvergenceMonitoringFunction.h b/Modules/Numerics/Optimizersv4/include/itkConvergenceMonitoringFunction.h index cc1629b9298..88b151823bb 100644 --- a/Modules/Numerics/Optimizersv4/include/itkConvergenceMonitoringFunction.h +++ b/Modules/Numerics/Optimizersv4/include/itkConvergenceMonitoringFunction.h @@ -25,9 +25,7 @@ #include -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class ConvergenceMonitoringFunction @@ -117,7 +115,6 @@ class ConvergenceMonitoringFunction : public Object EnergyValueContainerType m_EnergyValues{}; }; -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.h b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.h index 241f05b0b14..8b32df78d3c 100644 --- a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.h +++ b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.h @@ -20,9 +20,7 @@ #include "itkConvergenceMonitoringFunction.h" -namespace itk -{ -namespace Function +namespace itk::Function { /** * \class WindowConvergenceMonitoringFunction @@ -91,8 +89,7 @@ class ITK_TEMPLATE_EXPORT WindowConvergenceMonitoringFunction : public Convergen RealType m_TotalEnergy{}; }; -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #ifndef ITK_MANUAL_INSTANTIATION # include "itkWindowConvergenceMonitoringFunction.hxx" diff --git a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx index 4f1860866bd..671555de74d 100644 --- a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx @@ -25,9 +25,7 @@ #include "itkPointSet.h" #include "itkVector.h" -namespace itk -{ -namespace Function +namespace itk::Function { template @@ -136,7 +134,6 @@ WindowConvergenceMonitoringFunction::PrintSelf(std::ostream & os, Inden os << indent << "Window size: " << this->m_WindowSize << std::endl; } -} // end namespace Function -} // end namespace itk +} // namespace itk::Function #endif diff --git a/Modules/Numerics/Statistics/include/itkChiSquareDistribution.h b/Modules/Numerics/Statistics/include/itkChiSquareDistribution.h index ad901365061..9436a3492aa 100644 --- a/Modules/Numerics/Statistics/include/itkChiSquareDistribution.h +++ b/Modules/Numerics/Statistics/include/itkChiSquareDistribution.h @@ -22,9 +22,7 @@ #include "itkNumericTraits.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ChiSquareDistribution * \brief ChiSquareDistribution class defines the interface for a @@ -233,7 +231,6 @@ class ITKStatistics_EXPORT ChiSquareDistribution : public ProbabilityDistributio void PrintSelf(std::ostream & os, Indent indent) const override; }; // end of class -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.h b/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.h index 00306f0e9d3..103a7bc329a 100644 --- a/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.h @@ -23,9 +23,7 @@ #include "itkVariableSizeMatrix.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class CovarianceSampleFilter @@ -139,8 +137,7 @@ class ITK_TEMPLATE_EXPORT CovarianceSampleFilter : public ProcessObject void GenerateData() override; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkCovarianceSampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.hxx index efc4636cf6b..aa28408d989 100644 --- a/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.hxx @@ -20,9 +20,7 @@ #include "itkMeanSampleFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template CovarianceSampleFilter::CovarianceSampleFilter() @@ -218,7 +216,6 @@ CovarianceSampleFilter::GetMean() const -> const MeasurementVectorRealT { return this->GetMeanOutput()->Get(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkDecisionRule.h b/Modules/Numerics/Statistics/include/itkDecisionRule.h index 1f01aa22784..01045494cff 100644 --- a/Modules/Numerics/Statistics/include/itkDecisionRule.h +++ b/Modules/Numerics/Statistics/include/itkDecisionRule.h @@ -25,9 +25,7 @@ #include "itkArray.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class DecisionRule @@ -78,7 +76,6 @@ class ITKStatistics_EXPORT DecisionRule : public Object DecisionRule(); ~DecisionRule() override; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkDenseFrequencyContainer2.h b/Modules/Numerics/Statistics/include/itkDenseFrequencyContainer2.h index 9019db0f512..925d85658ab 100644 --- a/Modules/Numerics/Statistics/include/itkDenseFrequencyContainer2.h +++ b/Modules/Numerics/Statistics/include/itkDenseFrequencyContainer2.h @@ -23,9 +23,7 @@ #include "itkMeasurementVectorTraits.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class DenseFrequencyContainer2 @@ -121,7 +119,6 @@ class ITKStatistics_EXPORT DenseFrequencyContainer2 : public Object FrequencyContainerPointer m_FrequencyContainer{}; TotalAbsoluteFrequencyType m_TotalFrequency{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkDistanceMetric.h b/Modules/Numerics/Statistics/include/itkDistanceMetric.h index 2e48796b45b..1d35fc583bc 100644 --- a/Modules/Numerics/Statistics/include/itkDistanceMetric.h +++ b/Modules/Numerics/Statistics/include/itkDistanceMetric.h @@ -21,9 +21,7 @@ #include "itkFunctionBase.h" #include "itkMeasurementVectorTraits.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class DistanceMetric @@ -138,8 +136,7 @@ class ITK_TEMPLATE_EXPORT DistanceMetric : public FunctionBase /** Number of components in the MeasurementVectorType */ MeasurementVectorSizeType m_MeasurementVectorSize{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkDistanceMetric.hxx" diff --git a/Modules/Numerics/Statistics/include/itkDistanceMetric.hxx b/Modules/Numerics/Statistics/include/itkDistanceMetric.hxx index bef17e3e7dc..e5a5fadd958 100644 --- a/Modules/Numerics/Statistics/include/itkDistanceMetric.hxx +++ b/Modules/Numerics/Statistics/include/itkDistanceMetric.hxx @@ -18,10 +18,7 @@ #ifndef itkDistanceMetric_hxx #define itkDistanceMetric_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template DistanceMetric::DistanceMetric() @@ -69,7 +66,6 @@ DistanceMetric::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Origin: " << this->GetOrigin() << std::endl; os << indent << "MeasurementVectorSize: " << this->GetMeasurementVectorSize() << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h index e4488d793fb..55d42f20b7a 100644 --- a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h +++ b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h @@ -21,9 +21,7 @@ #include "itkMembershipFunctionBase.h" #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class DistanceToCentroidMembershipFunction * \brief DistanceToCentroidMembershipFunction models class membership @@ -112,8 +110,7 @@ class ITK_TEMPLATE_EXPORT DistanceToCentroidMembershipFunction : public Membersh private: DistanceMetricPointer m_DistanceMetric{}; }; -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkDistanceToCentroidMembershipFunction.hxx" diff --git a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx index a585e8eaaf1..d9f636bf0b4 100644 --- a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx +++ b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx @@ -20,9 +20,7 @@ #include "itkEuclideanDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template DistanceToCentroidMembershipFunction::DistanceToCentroidMembershipFunction() @@ -90,6 +88,5 @@ DistanceToCentroidMembershipFunction::PrintSelf(std::ostream & os, Inde os << indent << "Distance Metric: " << m_DistanceMetric.GetPointer() << std::endl; } -} // end namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.h b/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.h index 62c39612877..8b554b62650 100644 --- a/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.h +++ b/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.h @@ -20,9 +20,7 @@ #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class EuclideanDistanceMetric @@ -72,8 +70,7 @@ class ITK_TEMPLATE_EXPORT EuclideanDistanceMetric : public DistanceMetric inline double @@ -84,7 +81,6 @@ EuclideanDistanceMetric::Evaluate(const ValueType & a, const ValueType return itk::Math::abs(temp); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.h b/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.h index 3c2b30cc4d7..28c75a7b516 100644 --- a/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.h +++ b/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.h @@ -20,9 +20,7 @@ #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class EuclideanSquareDistanceMetric @@ -64,8 +62,7 @@ class ITK_TEMPLATE_EXPORT EuclideanSquareDistanceMetric : public DistanceMetric< EuclideanSquareDistanceMetric() = default; ~EuclideanSquareDistanceMetric() override = default; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkEuclideanSquareDistanceMetric.hxx" diff --git a/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.hxx b/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.hxx index acc24e0dffb..ba51fa21158 100644 --- a/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.hxx +++ b/Modules/Numerics/Statistics/include/itkEuclideanSquareDistanceMetric.hxx @@ -18,10 +18,7 @@ #ifndef itkEuclideanSquareDistanceMetric_hxx #define itkEuclideanSquareDistanceMetric_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template inline double @@ -70,7 +67,6 @@ EuclideanSquareDistanceMetric::Evaluate(const MeasurementVectorType & x } return distance; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h index 79d3dc5c1fe..9ce2b8f3e4c 100644 --- a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h +++ b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h @@ -23,9 +23,7 @@ #include "itkGaussianMembershipFunction.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ExpectationMaximizationMixtureModelEstimatorEnums * \brief Contains all enum classes used by ExpectationMaximizationMixtureModelEstimator class. @@ -239,8 +237,7 @@ class ITK_TEMPLATE_EXPORT ExpectationMaximizationMixtureModelEstimator : public MembershipFunctionVectorObjectPointer m_MembershipFunctionsObject{}; MembershipFunctionsWeightsArrayPointer m_MembershipFunctionsWeightArrayObject{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkExpectationMaximizationMixtureModelEstimator.hxx" diff --git a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx index c4c8f074881..ff1958a4fc2 100644 --- a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx +++ b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx @@ -21,9 +21,7 @@ #include "itkNumericTraits.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ExpectationMaximizationMixtureModelEstimator::ExpectationMaximizationMixtureModelEstimator() @@ -394,7 +392,6 @@ ExpectationMaximizationMixtureModelEstimator::Update() { this->GenerateData(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkGaussianDistribution.h b/Modules/Numerics/Statistics/include/itkGaussianDistribution.h index 1d711eb08ea..d27d859950d 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianDistribution.h +++ b/Modules/Numerics/Statistics/include/itkGaussianDistribution.h @@ -21,9 +21,7 @@ #include "itkProbabilityDistribution.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class GaussianDistribution * \brief GaussianDistribution class defines the interface for a @@ -268,7 +266,6 @@ class ITKStatistics_EXPORT GaussianDistribution : public ProbabilityDistribution void PrintSelf(std::ostream & os, Indent indent) const override; }; // end of class -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h index 58b4a03992a..22229eb4759 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h +++ b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h @@ -21,9 +21,7 @@ #include "itkMatrix.h" #include "itkMembershipFunctionBase.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class GaussianMembershipFunction @@ -141,8 +139,7 @@ class ITK_TEMPLATE_EXPORT GaussianMembershipFunction : public MembershipFunction /** Boolean to cache whether the covariance is singular or nearly singular */ bool m_CovarianceNonsingular{ true }; }; -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkGaussianMembershipFunction.hxx" diff --git a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx index a6233a13907..8defde12f8f 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx +++ b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx @@ -18,10 +18,7 @@ #ifndef itkGaussianMembershipFunction_hxx #define itkGaussianMembershipFunction_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template GaussianMembershipFunction::GaussianMembershipFunction() @@ -185,7 +182,6 @@ GaussianMembershipFunction::InternalClone() const return loPtr; } -} // end namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.h b/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.h index b1e82821cf2..affd998b8f9 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.h +++ b/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.h @@ -23,9 +23,7 @@ #include "itkWeightedMeanSampleFilter.h" #include "itkWeightedCovarianceSampleFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class GaussianMixtureModelComponent @@ -117,8 +115,7 @@ class ITK_TEMPLATE_EXPORT GaussianMixtureModelComponent : public MixtureModelCom typename CovarianceEstimatorType::Pointer m_CovarianceEstimator{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkGaussianMixtureModelComponent.hxx" diff --git a/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx b/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx index 6f83784c9c6..923ee9c132d 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx +++ b/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx @@ -22,9 +22,7 @@ #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template GaussianMixtureModelComponent::GaussianMixtureModelComponent() @@ -282,7 +280,6 @@ GaussianMixtureModelComponent::GenerateData() Superclass::SetParameters(parameters); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h index f87db620484..9c52225b414 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h @@ -20,9 +20,7 @@ #include "itkUniformRandomSpatialNeighborSubsampler.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class GaussianRandomSpatialNeighborSubsampler @@ -120,8 +118,7 @@ class ITK_TEMPLATE_EXPORT GaussianRandomSpatialNeighborSubsampler RealType m_Variance{}; }; // end of class GaussianRandomSpatialNeighborSubsampler -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkGaussianRandomSpatialNeighborSubsampler.hxx" diff --git a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx index d2e669e5408..a8cd2f6507e 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx +++ b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx @@ -18,9 +18,7 @@ #ifndef itkGaussianRandomSpatialNeighborSubsampler_hxx #define itkGaussianRandomSpatialNeighborSubsampler_hxx -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template @@ -75,7 +73,6 @@ GaussianRandomSpatialNeighborSubsampler::PrintSelf(std::ostrea os << std::endl; } -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkHistogram.h b/Modules/Numerics/Statistics/include/itkHistogram.h index 533daa896ae..a02901b0c4f 100644 --- a/Modules/Numerics/Statistics/include/itkHistogram.h +++ b/Modules/Numerics/Statistics/include/itkHistogram.h @@ -25,9 +25,7 @@ #include "itkDenseFrequencyContainer2.h" #include "itkSparseFrequencyContainer2.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** @@ -517,8 +515,7 @@ class ITK_TEMPLATE_EXPORT Histogram : public Sample> bool m_ClipBinsAtEnds{ true }; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkHistogram.hxx" diff --git a/Modules/Numerics/Statistics/include/itkHistogram.hxx b/Modules/Numerics/Statistics/include/itkHistogram.hxx index 7e693edc685..0de5384f521 100644 --- a/Modules/Numerics/Statistics/include/itkHistogram.hxx +++ b/Modules/Numerics/Statistics/include/itkHistogram.hxx @@ -22,9 +22,7 @@ #include "itkMath.h" #include "itkPrintHelper.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template Histogram::Histogram() @@ -718,7 +716,6 @@ Histogram::Graft(const DataObject * thatObjec } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.h index 1d615ec7ec2..c186102afe9 100644 --- a/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.h @@ -23,9 +23,7 @@ #include "itkProcessObject.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class HistogramToRunLengthFeaturesFilterEnums * \brief Contains all enum classes used by HistogramToRunLengthFeaturesFilter class. @@ -237,8 +235,7 @@ class ITK_TEMPLATE_EXPORT HistogramToRunLengthFeaturesFilter : public ProcessObj unsigned long m_TotalNumberOfRuns{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkHistogramToRunLengthFeaturesFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.hxx b/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.hxx index 5cf9501102c..917465415cc 100644 --- a/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkHistogramToRunLengthFeaturesFilter.hxx @@ -22,9 +22,7 @@ #include "itkNumericTraits.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { // constructor @@ -352,8 +350,7 @@ HistogramToRunLengthFeaturesFilter::PrintSelf(std::ostream & os, Ind Superclass::PrintSelf(os, indent); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.h index bc590d93922..6b2671e4507 100644 --- a/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.h @@ -23,9 +23,7 @@ #include "itkProcessObject.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class HistogramToTextureFeaturesFilterEnums *\brief This class contains all enum classes used by HistogramToTextureFeaturesFilter class. @@ -258,8 +256,7 @@ class ITK_TEMPLATE_EXPORT HistogramToTextureFeaturesFilter : public ProcessObjec RelativeFrequencyContainerType m_RelativeFrequencyContainer{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkHistogramToTextureFeaturesFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.hxx b/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.hxx index 1513a252c69..33aff77f523 100644 --- a/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkHistogramToTextureFeaturesFilter.hxx @@ -23,9 +23,7 @@ #include "itkMath.h" #include // For make_unique. -namespace itk -{ -namespace Statistics +namespace itk::Statistics { // constructor template @@ -385,7 +383,6 @@ HistogramToTextureFeaturesFilter::PrintSelf(std::ostream & os, Inden { Superclass::PrintSelf(os, indent); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h b/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h index c9fb3bf6326..a2292651a15 100644 --- a/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h +++ b/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h @@ -25,9 +25,7 @@ #include "itkImageToImageFilter.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ImageClassifierFilter @@ -164,8 +162,7 @@ class ITK_TEMPLATE_EXPORT ImageClassifierFilter : public ImageToImageFilter ImageClassifierFilter::ImageClassifierFilter() @@ -174,7 +172,6 @@ ImageClassifierFilter::GenerateData() ++outItr; } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h b/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h index cd2c897bee0..8f631676a38 100644 --- a/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h +++ b/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h @@ -25,9 +25,7 @@ #include "itkSimpleDataObjectDecorator.h" #include "itkProgressReporter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ImageToHistogramFilter @@ -189,8 +187,7 @@ class ITK_TEMPLATE_EXPORT ImageToHistogramFilter : public ImageSink HistogramMeasurementVectorType & max, HistogramSizeType & size); }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkImageToHistogramFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.hxx b/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.hxx index 8ece83d92f9..acfd33c36de 100644 --- a/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.hxx @@ -20,9 +20,7 @@ #include "itkImageRegionConstIterator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ImageToHistogramFilter::ImageToHistogramFilter() @@ -381,7 +379,6 @@ ImageToHistogramFilter::PrintSelf(std::ostream & os, Indent indent) cons os << indent << "HistogramSize: " << this->GetHistogramSize() << std::endl; } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.h index bbb29d78517..3011f120f27 100644 --- a/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.h +++ b/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.h @@ -28,9 +28,7 @@ #include "itkImageRegionIterator.h" #include "itkMeasurementVectorTraits.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ImageToListSampleAdaptor * \brief This class provides ListSample interface to ITK Image @@ -308,8 +306,7 @@ class ITK_TEMPLATE_EXPORT ImageToListSampleAdaptor mutable MeasurementVectorType m_MeasurementVectorInternal{}; }; // end of class ImageToListSampleAdaptor -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkImageToListSampleAdaptor.hxx" diff --git a/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.hxx b/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.hxx index b70faa8b1e5..55f09a51b7b 100644 --- a/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.hxx +++ b/Modules/Numerics/Statistics/include/itkImageToListSampleAdaptor.hxx @@ -18,10 +18,7 @@ #ifndef itkImageToListSampleAdaptor_hxx #define itkImageToListSampleAdaptor_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ImageToListSampleAdaptor::ImageToListSampleAdaptor() @@ -123,7 +120,6 @@ ImageToListSampleAdaptor::GetTotalFrequency() const -> TotalAbsoluteFreq return this->Size(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.h b/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.h index 340d9f91b0c..4983bfa2979 100644 --- a/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.h @@ -23,9 +23,7 @@ #include "itkProcessObject.h" #include "itkDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ImageToListSampleFilter @@ -147,8 +145,7 @@ class ITK_TEMPLATE_EXPORT ImageToListSampleFilter : public ProcessObject private: MaskPixelType m_MaskValue{}; }; // end of class ImageToListSampleFilter -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkImageToListSampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.hxx index 172559ccecf..2a596a85562 100644 --- a/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkImageToListSampleFilter.hxx @@ -20,9 +20,7 @@ #include "itkImageRegionConstIterator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ImageToListSampleFilter::ImageToListSampleFilter() @@ -186,7 +184,6 @@ ImageToListSampleFilter::GetOutput() const -> const ListSamp return output; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h index 7a9704642d6..6c6c81e15ad 100644 --- a/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h +++ b/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h @@ -24,9 +24,7 @@ #include "itkImageRegionIterator.h" #include "itkListSample.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ImageJointDomainTraits * \brief This class provides the type definition for the measurement @@ -343,8 +341,7 @@ class ITK_TEMPLATE_EXPORT JointDomainImageToListSampleAdaptor PixelContainerConstPointer m_PixelContainer{}; }; // end of class JointDomainImageToListSampleAdaptor -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkJointDomainImageToListSampleAdaptor.hxx" diff --git a/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.hxx b/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.hxx index 1ad0e07bb04..87ca2224658 100644 --- a/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.hxx +++ b/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.hxx @@ -18,10 +18,7 @@ #ifndef itkJointDomainImageToListSampleAdaptor_hxx #define itkJointDomainImageToListSampleAdaptor_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template JointDomainImageToListSampleAdaptor::JointDomainImageToListSampleAdaptor() @@ -148,7 +145,6 @@ JointDomainImageToListSampleAdaptor::GetMeasurementVector(InstanceIdenti return m_TempVector; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkKdTree.h b/Modules/Numerics/Statistics/include/itkKdTree.h index 0e227bcb402..8be0f1d2117 100644 --- a/Modules/Numerics/Statistics/include/itkKdTree.h +++ b/Modules/Numerics/Statistics/include/itkKdTree.h @@ -30,9 +30,7 @@ #include "itkEuclideanDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class KdTreeNode @@ -838,8 +836,7 @@ class ITK_TEMPLATE_EXPORT KdTree : public Object /** Measurement vector size */ MeasurementVectorSizeType m_MeasurementVectorSize{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkKdTree.hxx" diff --git a/Modules/Numerics/Statistics/include/itkKdTree.hxx b/Modules/Numerics/Statistics/include/itkKdTree.hxx index 257ccd3d620..b30c3fa2e73 100644 --- a/Modules/Numerics/Statistics/include/itkKdTree.hxx +++ b/Modules/Numerics/Statistics/include/itkKdTree.hxx @@ -18,10 +18,7 @@ #ifndef itkKdTree_hxx #define itkKdTree_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template KdTreeNonterminalNode::KdTreeNonterminalNode(unsigned int partitionDimension, @@ -617,7 +614,6 @@ KdTree::PlotTree(KdTreeNodeType * node, std::ostream & os) const this->PlotTree(right, os); } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h index 3527922c99d..b015b9f94c1 100644 --- a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h +++ b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h @@ -27,9 +27,7 @@ #include "itkSimpleDataObjectDecorator.h" #include "itkNumericTraitsArrayPixel.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class KdTreeBasedKmeansEstimator @@ -341,8 +339,7 @@ class ITK_TEMPLATE_EXPORT KdTreeBasedKmeansEstimator : public Object MeasurementVectorSizeType m_MeasurementVectorSize{ 0 }; MembershipFunctionVectorObjectPointer m_MembershipFunctionsObject{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkKdTreeBasedKmeansEstimator.hxx" diff --git a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.hxx b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.hxx index c0c54138af3..3d571707b10 100644 --- a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.hxx +++ b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.hxx @@ -20,9 +20,7 @@ #include "itkStatisticsAlgorithm.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template KdTreeBasedKmeansEstimator::KdTreeBasedKmeansEstimator() @@ -431,7 +429,6 @@ KdTreeBasedKmeansEstimator::PrintPoint(ParameterType & point) } std::cout << ']'; } -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkKdTreeGenerator.h b/Modules/Numerics/Statistics/include/itkKdTreeGenerator.h index 4a224235004..97d278e6445 100644 --- a/Modules/Numerics/Statistics/include/itkKdTreeGenerator.h +++ b/Modules/Numerics/Statistics/include/itkKdTreeGenerator.h @@ -23,9 +23,7 @@ #include "itkKdTree.h" #include "itkStatisticsAlgorithm.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class KdTreeGenerator @@ -206,8 +204,7 @@ class ITK_TEMPLATE_EXPORT KdTreeGenerator : public Object /** Length of a measurement vector */ MeasurementVectorSizeType m_MeasurementVectorSize{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkKdTreeGenerator.hxx" diff --git a/Modules/Numerics/Statistics/include/itkKdTreeGenerator.hxx b/Modules/Numerics/Statistics/include/itkKdTreeGenerator.hxx index 67522f64437..cfc5e0fb155 100644 --- a/Modules/Numerics/Statistics/include/itkKdTreeGenerator.hxx +++ b/Modules/Numerics/Statistics/include/itkKdTreeGenerator.hxx @@ -18,10 +18,7 @@ #ifndef itkKdTreeGenerator_hxx #define itkKdTreeGenerator_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template KdTreeGenerator::KdTreeGenerator() @@ -207,7 +204,6 @@ KdTreeGenerator::GenerateTreeLoop(unsigned int beginIndex, return this->GenerateNonterminalNode(beginIndex, endIndex, lowerBound, upperBound, level + 1); } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkListSample.h b/Modules/Numerics/Statistics/include/itkListSample.h index 9e8217474e4..94e0323ef8c 100644 --- a/Modules/Numerics/Statistics/include/itkListSample.h +++ b/Modules/Numerics/Statistics/include/itkListSample.h @@ -24,9 +24,7 @@ #include -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ListSample * \brief This class is the native implementation of the a Sample with an STL container @@ -279,8 +277,7 @@ class ITK_TEMPLATE_EXPORT ListSample : public Sample private: InternalDataContainerType m_InternalContainer{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkListSample.hxx" diff --git a/Modules/Numerics/Statistics/include/itkListSample.hxx b/Modules/Numerics/Statistics/include/itkListSample.hxx index 67ddf5d3a0d..1be2bcf86d5 100644 --- a/Modules/Numerics/Statistics/include/itkListSample.hxx +++ b/Modules/Numerics/Statistics/include/itkListSample.hxx @@ -18,10 +18,7 @@ #ifndef itkListSample_hxx #define itkListSample_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template void @@ -134,7 +131,6 @@ ListSample::PrintSelf(std::ostream & os, Indent indent) cons os << indent << "InternalContainer: " << &m_InternalContainer << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h index 9c61cfca8e2..c9f377bef94 100644 --- a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h +++ b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h @@ -23,9 +23,7 @@ #include "itkMembershipFunctionBase.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class MahalanobisDistanceMembershipFunction * \brief MahalanobisDistanceMembershipFunction models class @@ -141,8 +139,7 @@ class ITK_TEMPLATE_EXPORT MahalanobisDistanceMembershipFunction : public Members /** Boolean to cache whether the covariance is singular or nearly singular */ bool m_CovarianceNonsingular{}; }; -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkMahalanobisDistanceMembershipFunction.hxx" diff --git a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx index d943d434c78..d5fcac649e6 100644 --- a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx +++ b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx @@ -23,9 +23,7 @@ #include "vnl/vnl_matrix.h" #include "vnl/algo/vnl_matrix_inverse.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template MahalanobisDistanceMembershipFunction::MahalanobisDistanceMembershipFunction() @@ -188,7 +186,6 @@ MahalanobisDistanceMembershipFunction::InternalClone() const return loPtr; } -} // end namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.h b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.h index dc932d2edbf..459530c8d3b 100644 --- a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.h +++ b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.h @@ -28,9 +28,7 @@ #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MahalanobisDistanceMetric @@ -137,8 +135,7 @@ class ITK_TEMPLATE_EXPORT MahalanobisDistanceMetric : public DistanceMetric MahalanobisDistanceMetric::MahalanobisDistanceMetric() @@ -210,7 +207,6 @@ MahalanobisDistanceMetric::PrintSelf(std::ostream & os, Indent indent) os << indent << "Double max: " << std::endl; os << this->GetDoubleMax() << std::endl; } -} // end namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.h b/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.h index 839db13cb2f..7049e377609 100644 --- a/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.h +++ b/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.h @@ -20,9 +20,7 @@ #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ManhattanDistanceMetric @@ -66,8 +64,7 @@ class ITK_TEMPLATE_EXPORT ManhattanDistanceMetric : public DistanceMetric inline double @@ -65,7 +62,6 @@ ManhattanDistanceMetric::Evaluate(const MeasurementVectorType & x1, con } return distance; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.h b/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.h index f049d8bc1ea..a9187eff688 100644 --- a/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.h +++ b/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.h @@ -22,9 +22,7 @@ #include "itkImageToHistogramFilter.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MaskedImageToHistogramFilter @@ -95,8 +93,7 @@ class ITK_TEMPLATE_EXPORT MaskedImageToHistogramFilter : public ImageToHistogram void ThreadedComputeMinimumAndMaximum(const RegionType & inputRegionForThread) override; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkMaskedImageToHistogramFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.hxx b/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.hxx index d93461ba5ed..2f9e701aebb 100644 --- a/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.hxx @@ -21,9 +21,7 @@ #include "itkProgressReporter.h" #include "itkImageRegionConstIterator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template MaskedImageToHistogramFilter::MaskedImageToHistogramFilter() @@ -111,7 +109,6 @@ MaskedImageToHistogramFilter::ThreadedStreamedGenerateData(c this->ThreadedMergeHistogram(std::move(histogram)); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMaximumDecisionRule.h b/Modules/Numerics/Statistics/include/itkMaximumDecisionRule.h index 5c451a6419b..4e0ab11b9cc 100644 --- a/Modules/Numerics/Statistics/include/itkMaximumDecisionRule.h +++ b/Modules/Numerics/Statistics/include/itkMaximumDecisionRule.h @@ -21,9 +21,7 @@ #include "itkDecisionRule.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MaximumDecisionRule @@ -72,7 +70,6 @@ class ITKStatistics_EXPORT MaximumDecisionRule : public DecisionRule ~MaximumDecisionRule() override = default; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMaximumRatioDecisionRule.h b/Modules/Numerics/Statistics/include/itkMaximumRatioDecisionRule.h index 96f50601a65..efc7ba1e63f 100644 --- a/Modules/Numerics/Statistics/include/itkMaximumRatioDecisionRule.h +++ b/Modules/Numerics/Statistics/include/itkMaximumRatioDecisionRule.h @@ -25,9 +25,7 @@ #include "itkDecisionRule.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MaximumRatioDecisionRule @@ -114,6 +112,6 @@ class ITKStatistics_EXPORT MaximumRatioDecisionRule : public DecisionRule PriorProbabilityVectorType m_PriorProbabilities{}; }; // end of class -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics + #endif diff --git a/Modules/Numerics/Statistics/include/itkMeanSampleFilter.h b/Modules/Numerics/Statistics/include/itkMeanSampleFilter.h index bcd03e97219..39402b52bc1 100644 --- a/Modules/Numerics/Statistics/include/itkMeanSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkMeanSampleFilter.h @@ -22,9 +22,7 @@ #include "itkArray.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MeanSampleFilter @@ -119,8 +117,7 @@ class ITK_TEMPLATE_EXPORT MeanSampleFilter : public ProcessObject void GenerateData() override; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkMeanSampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkMeanSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkMeanSampleFilter.hxx index 30b2d0804ef..4c8f96dc91b 100644 --- a/Modules/Numerics/Statistics/include/itkMeanSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkMeanSampleFilter.hxx @@ -23,9 +23,7 @@ #include "itkCompensatedSummation.h" #include "itkMeasurementVectorTraits.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template MeanSampleFilter::MeanSampleFilter() @@ -158,7 +156,6 @@ MeanSampleFilter::GenerateData() decoratedOutput->Set(output); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMeasurementVectorTraits.h b/Modules/Numerics/Statistics/include/itkMeasurementVectorTraits.h index f4adeab1bc8..ce2a4737782 100644 --- a/Modules/Numerics/Statistics/include/itkMeasurementVectorTraits.h +++ b/Modules/Numerics/Statistics/include/itkMeasurementVectorTraits.h @@ -28,9 +28,7 @@ #include "itkSize.h" #include -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class MeasurementVectorTraits * \ingroup Statistics @@ -530,7 +528,7 @@ class MeasurementVectorPixelTraits /// \endcond -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics + #endif // itkMeasurementVectorTraits_h diff --git a/Modules/Numerics/Statistics/include/itkMembershipFunctionBase.h b/Modules/Numerics/Statistics/include/itkMembershipFunctionBase.h index 1fc471e479a..4f5a6faa50a 100644 --- a/Modules/Numerics/Statistics/include/itkMembershipFunctionBase.h +++ b/Modules/Numerics/Statistics/include/itkMembershipFunctionBase.h @@ -22,9 +22,7 @@ #include "itkMeasurementVectorTraits.h" #include "itkNumericTraitsCovariantVectorPixel.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MembershipFunctionBase @@ -139,7 +137,6 @@ class ITK_TEMPLATE_EXPORT MembershipFunctionBase : public FunctionBase #include "itkSubsample.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MembershipSample @@ -317,8 +315,7 @@ class ITK_TEMPLATE_EXPORT MembershipSample : public DataObject SampleConstPointer m_Sample{}; unsigned int m_NumberOfClasses{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkMembershipSample.hxx" diff --git a/Modules/Numerics/Statistics/include/itkMembershipSample.hxx b/Modules/Numerics/Statistics/include/itkMembershipSample.hxx index 3059987948a..9a081a3af36 100644 --- a/Modules/Numerics/Statistics/include/itkMembershipSample.hxx +++ b/Modules/Numerics/Statistics/include/itkMembershipSample.hxx @@ -18,10 +18,7 @@ #ifndef itkMembershipSample_hxx #define itkMembershipSample_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template MembershipSample::MembershipSample() = default; @@ -154,7 +151,6 @@ MembershipSample::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Sample: " << m_Sample.GetPointer() << std::endl; os << indent << "NumberOfClasses: " << this->GetNumberOfClasses() << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMinimumDecisionRule.h b/Modules/Numerics/Statistics/include/itkMinimumDecisionRule.h index 86d38cba5fa..ca875fa56c8 100644 --- a/Modules/Numerics/Statistics/include/itkMinimumDecisionRule.h +++ b/Modules/Numerics/Statistics/include/itkMinimumDecisionRule.h @@ -21,9 +21,7 @@ #include "itkDecisionRule.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class MinimumDecisionRule * \brief A decision rule that returns the class label with the @@ -69,7 +67,6 @@ class ITKStatistics_EXPORT MinimumDecisionRule : public DecisionRule ~MinimumDecisionRule() override = default; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.h b/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.h index 0b87ec73597..46e13199d7a 100644 --- a/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.h +++ b/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.h @@ -25,9 +25,7 @@ #include "itkObject.h" #include "itkMembershipFunctionBase.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class MixtureModelComponentBase @@ -172,8 +170,7 @@ class ITK_TEMPLATE_EXPORT MixtureModelComponentBase : public Object /** indicative flag of membership function's parameter changes */ bool m_ParametersModified{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkMixtureModelComponentBase.hxx" diff --git a/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.hxx b/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.hxx index 29b391114ea..66d8a03d1ad 100644 --- a/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.hxx +++ b/Modules/Numerics/Statistics/include/itkMixtureModelComponentBase.hxx @@ -18,10 +18,7 @@ #ifndef itkMixtureModelComponentBase_hxx #define itkMixtureModelComponentBase_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template MixtureModelComponentBase::MixtureModelComponentBase() @@ -156,7 +153,6 @@ MixtureModelComponentBase::Update() { this->GenerateData(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkNeighborhoodSampler.h b/Modules/Numerics/Statistics/include/itkNeighborhoodSampler.h index b4fffc8a1de..a646d7a4b1b 100644 --- a/Modules/Numerics/Statistics/include/itkNeighborhoodSampler.h +++ b/Modules/Numerics/Statistics/include/itkNeighborhoodSampler.h @@ -21,9 +21,7 @@ #include "itkSampleToSubsampleFilter.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class NeighborhoodSampler * \brief Generates a Subsample out of a Sample, based on a user-provided @@ -84,8 +82,7 @@ class ITK_TEMPLATE_EXPORT NeighborhoodSampler : public SampleToSubsampleFilter @@ -56,7 +53,6 @@ NeighborhoodSampler::PrintSelf(std::ostream & os, Indent indent) const // m_Radius os << indent << "Radius: " << this->GetRadiusInput() << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkNormalVariateGenerator.h b/Modules/Numerics/Statistics/include/itkNormalVariateGenerator.h index 45da3dd6948..0427fa0d15e 100644 --- a/Modules/Numerics/Statistics/include/itkNormalVariateGenerator.h +++ b/Modules/Numerics/Statistics/include/itkNormalVariateGenerator.h @@ -22,9 +22,7 @@ #include "itkRandomVariateGeneratorBase.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class NormalVariateGenerator * \brief Normal random variate generator @@ -160,6 +158,5 @@ class ITKStatistics_EXPORT NormalVariateGenerator : public RandomVariateGenerato double m_Chic2{}; double m_ActualRSD{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkPointSetToListSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkPointSetToListSampleAdaptor.h index 639279027d7..fbfcaf419a4 100644 --- a/Modules/Numerics/Statistics/include/itkPointSetToListSampleAdaptor.h +++ b/Modules/Numerics/Statistics/include/itkPointSetToListSampleAdaptor.h @@ -24,9 +24,7 @@ #include "itkListSample.h" #include "itkSmartPointer.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class PointSetToListSampleAdaptor @@ -270,8 +268,7 @@ class ITK_TEMPLATE_EXPORT PointSetToListSampleAdaptor : public ListSample PointSetToListSampleAdaptor::PointSetToListSampleAdaptor() @@ -118,7 +115,6 @@ PointSetToListSampleAdaptor::GetTotalFrequency() const -> TotalAbsolu return this->Size(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkProbabilityDistribution.h b/Modules/Numerics/Statistics/include/itkProbabilityDistribution.h index 2b2e7e6adfc..795260df29d 100644 --- a/Modules/Numerics/Statistics/include/itkProbabilityDistribution.h +++ b/Modules/Numerics/Statistics/include/itkProbabilityDistribution.h @@ -24,9 +24,7 @@ #include "itkArray.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ProbabilityDistribution * \brief ProbabilityDistribution class defines common interface for @@ -166,7 +164,6 @@ class ITKStatistics_EXPORT ProbabilityDistribution : public Object ParametersType m_Parameters{}; }; // end of class -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h b/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h index 73a7e2e7ea3..03c665656a6 100644 --- a/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h @@ -21,9 +21,7 @@ #include "itkSubsamplerBase.h" #include "itkImageRegion.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class RegionConstrainedSubsampler @@ -134,8 +132,7 @@ class ITK_TEMPLATE_EXPORT RegionConstrainedSubsampler : public SubsamplerBase @@ -114,7 +112,6 @@ RegionConstrainedSubsampler::PrintSelf(std::ostream & os, Inde os << std::endl; } -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSample.h b/Modules/Numerics/Statistics/include/itkSample.h index aab404dcdf0..de53aa77cdd 100644 --- a/Modules/Numerics/Statistics/include/itkSample.h +++ b/Modules/Numerics/Statistics/include/itkSample.h @@ -23,9 +23,7 @@ #include "itkMeasurementVectorTraits.h" #include // for the size_type declaration -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class Sample @@ -184,7 +182,6 @@ class Sample : public DataObject private: MeasurementVectorSizeType m_MeasurementVectorSize{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h b/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h index f003e020893..88166aedc9e 100644 --- a/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h +++ b/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h @@ -26,9 +26,7 @@ #include "itkProcessObject.h" #include "itkSimpleDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class SampleClassifierFilter @@ -159,8 +157,7 @@ class ITK_TEMPLATE_EXPORT SampleClassifierFilter : public ProcessObject /** Decision Rule */ DecisionRulePointer m_DecisionRule{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkSampleClassifierFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.hxx b/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.hxx index 7caa28783f2..1ae41963ba9 100644 --- a/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.hxx @@ -18,10 +18,7 @@ #ifndef itkSampleClassifierFilter_hxx #define itkSampleClassifierFilter_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template SampleClassifierFilter::SampleClassifierFilter() @@ -175,7 +172,6 @@ SampleClassifierFilter::GetOutput() const -> const MembershipSampleType { return static_cast(this->ProcessObject::GetOutput(0)); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.h b/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.h index 984006cbf70..c2ca664fb02 100644 --- a/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.h +++ b/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.h @@ -43,9 +43,7 @@ itkDeclareExceptionMacro(HistogramWrongNumberOfComponents, SampleToHistogramFilterException, "Histogram has wrong number of components"); -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** @@ -197,8 +195,7 @@ class ITK_TEMPLATE_EXPORT SampleToHistogramFilter : public ProcessObject } }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkSampleToHistogramFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.hxx b/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.hxx index e43cdf98971..661c5315cac 100644 --- a/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkSampleToHistogramFilter.hxx @@ -20,9 +20,7 @@ #include "itkStatisticsAlgorithm.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template SampleToHistogramFilter::SampleToHistogramFilter() @@ -278,7 +276,6 @@ SampleToHistogramFilter::GenerateData() ++iter; } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h b/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h index 4ea23f14adb..d69b9749289 100644 --- a/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h @@ -21,9 +21,7 @@ #include "itkSubsample.h" #include "itkProcessObject.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class SampleToSubsampleFilter * \brief Base class of filters intended to select subsamples from samples. @@ -99,8 +97,7 @@ class ITK_TEMPLATE_EXPORT SampleToSubsampleFilter : public ProcessObject MakeOutput(DataObjectPointerArraySizeType idx) override; /** @ITKEndGrouping */ }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkSampleToSubsampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.hxx b/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.hxx index 15b72900784..324584bc74b 100644 --- a/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.hxx @@ -18,10 +18,7 @@ #ifndef itkSampleToSubsampleFilter_hxx #define itkSampleToSubsampleFilter_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template SampleToSubsampleFilter::SampleToSubsampleFilter() @@ -71,7 +68,6 @@ SampleToSubsampleFilter::PrintSelf(std::ostream & os, Indent indent) co { this->Superclass::PrintSelf(os, indent); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.h index 9e5c805081f..e5ffd2889ad 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.h @@ -32,9 +32,7 @@ #include #include -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ScalarImageToCooccurrenceListSampleFilter @@ -120,8 +118,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToCooccurrenceListSampleFilter : public Pro private: OffsetTable m_OffsetTable{}; }; // end of class ScalarImageToListSampleFilter -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarImageToCooccurrenceListSampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.hxx index d837784305c..083e93970ac 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceListSampleFilter.hxx @@ -18,10 +18,7 @@ #ifndef itkScalarImageToCooccurrenceListSampleFilter_hxx #define itkScalarImageToCooccurrenceListSampleFilter_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ScalarImageToCooccurrenceListSampleFilter::ScalarImageToCooccurrenceListSampleFilter() @@ -163,7 +160,6 @@ ScalarImageToCooccurrenceListSampleFilter::UseNeighbor(const OffsetType m_OffsetTable.push_back(offset); } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h index 7e88facc042..ed29acb8442 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h @@ -24,9 +24,7 @@ #include "itkNumericTraits.h" #include "itkProcessObject.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ScalarImageToCooccurrenceMatrixFilter * \brief This class computes a co-occurrence matrix (histogram) from @@ -224,8 +222,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToCooccurrenceMatrixFilter : public Process MaskPixelType m_InsidePixelValue{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarImageToCooccurrenceMatrixFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx index deeb53d2a3b..b443e2e696b 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx @@ -22,9 +22,7 @@ #include "itkConstNeighborhoodIterator.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ScalarImageToCooccurrenceMatrixFilter:: @@ -355,7 +353,6 @@ ScalarImageToCooccurrenceMatrixFilterGetNormalize() << std::endl; os << indent << "InsidePixelValue: " << this->GetInsidePixelValue() << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h index c3e43689434..67c969495a6 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h @@ -23,9 +23,7 @@ #include "itkHistogram.h" #include "itkObject.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ScalarImageToHistogramGenerator @@ -118,8 +116,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToHistogramGenerator : public Object GeneratorPointer m_HistogramGenerator{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarImageToHistogramGenerator.hxx" diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx index 0fddbf85ccc..2a457c057c6 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx @@ -18,10 +18,7 @@ #ifndef itkScalarImageToHistogramGenerator_hxx #define itkScalarImageToHistogramGenerator_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ScalarImageToHistogramGenerator::ScalarImageToHistogramGenerator() @@ -107,7 +104,6 @@ ScalarImageToHistogramGenerator::PrintSelf(std::ostream & os, Indent ind itkPrintSelfObjectMacro(ImageToListSampleAdaptor); itkPrintSelfObjectMacro(HistogramGenerator); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h index b339523a246..d381a33bdae 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h @@ -23,9 +23,7 @@ #include "itkHistogramToRunLengthFeaturesFilter.h" #include "itkScalarImageToRunLengthMatrixFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class ScalarImageToRunLengthFeaturesFilter @@ -225,8 +223,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToRunLengthFeaturesFilter : public ProcessO OffsetVectorConstPointer m_Offsets{}; bool m_FastCalculations{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarImageToRunLengthFeaturesFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx index 7904bb75bd3..21a5348efb2 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx @@ -22,9 +22,7 @@ #include "itkMath.h" #include "itkMakeUniqueForOverwrite.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ScalarImageToRunLengthFeaturesFilter::ScalarImageToRunLengthFeaturesFilter() @@ -351,7 +349,6 @@ ScalarImageToRunLengthFeaturesFilter::Prin os << indent << "Offsets: " << this->GetOffsets() << std::endl; os << indent << "FeatureMeans: " << this->GetFeatureMeans() << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.h index 349550efd61..f85c1e28d07 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.h @@ -24,9 +24,7 @@ #include "itkVectorContainer.h" #include "itkProcessObject.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** @@ -267,8 +265,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToRunLengthMatrixFilter : public ProcessObj MeasurementVectorType m_UpperBound{}; OffsetVectorPointer m_Offsets{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarImageToRunLengthMatrixFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.hxx index b62ccc68774..94d3a8a01dc 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthMatrixFilter.hxx @@ -24,9 +24,7 @@ #include "itkMacro.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template @@ -342,8 +340,7 @@ ScalarImageToRunLengthMatrixFilter::No itkDebugMacro("new offset = " << offset << std::endl); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h index 2c352cb4fb5..5497bd981d8 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h @@ -23,9 +23,7 @@ #include "itkHistogramToTextureFeaturesFilter.h" #include "itkScalarImageToCooccurrenceMatrixFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class ScalarImageToTextureFeaturesFilter * \brief This class computes texture descriptions from an image. @@ -239,8 +237,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToTextureFeaturesFilter : public ProcessObj OffsetVectorConstPointer m_Offsets{}; bool m_FastCalculations{}; }; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkScalarImageToTextureFeaturesFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx index 60affaea3e5..b815835a23b 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx @@ -21,9 +21,7 @@ #include "itkNeighborhood.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template ScalarImageToTextureFeaturesFilter:: @@ -330,7 +328,6 @@ ScalarImageToTextureFeaturesFilterGetOffsets() << std::endl; os << indent << "FeatureMeans: " << this->GetFeatureMeans() << std::endl; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSparseFrequencyContainer2.h b/Modules/Numerics/Statistics/include/itkSparseFrequencyContainer2.h index 8b833ba5b17..11b481173ee 100644 --- a/Modules/Numerics/Statistics/include/itkSparseFrequencyContainer2.h +++ b/Modules/Numerics/Statistics/include/itkSparseFrequencyContainer2.h @@ -25,9 +25,7 @@ #include "itkMeasurementVectorTraits.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class SparseFrequencyContainer2 @@ -115,7 +113,6 @@ class ITKStatistics_EXPORT SparseFrequencyContainer2 : public Object FrequencyContainerType m_FrequencyContainer{}; TotalAbsoluteFrequencyType m_TotalFrequency{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h index c7e471e755c..d3ca5556013 100644 --- a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h @@ -21,9 +21,7 @@ #include "itkRegionConstrainedSubsampler.h" #include "itkImageHelper.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class SpatialNeighborSubsampler @@ -128,8 +126,7 @@ class ITK_TEMPLATE_EXPORT SpatialNeighborSubsampler : public RegionConstrainedSu bool m_RadiusInitialized{}; }; // end of class SpatialNeighborSubsampler -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkSpatialNeighborSubsampler.hxx" diff --git a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx index af466345abf..badf2d4f571 100644 --- a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx +++ b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx @@ -19,9 +19,7 @@ #define itkSpatialNeighborSubsampler_hxx #include "itkImageRegionConstIteratorWithIndex.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template @@ -198,7 +196,6 @@ SpatialNeighborSubsampler::PrintSelf(std::ostream & os, Indent os << std::endl; } -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.h b/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.h index 69e51c38416..5649c6b7eca 100644 --- a/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.h @@ -24,9 +24,7 @@ #include "itkSimpleDataObjectDecorator.h" #include "itkNumericTraitsFixedArrayPixel.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class StandardDeviationPerComponentSampleFilter @@ -121,8 +119,7 @@ class ITK_TEMPLATE_EXPORT StandardDeviationPerComponentSampleFilter : public Pro private: }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkStandardDeviationPerComponentSampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx index fff6f3e58f4..a7e6ce9527f 100644 --- a/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx @@ -21,9 +21,7 @@ #include "itkMeasurementVectorTraits.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template StandardDeviationPerComponentSampleFilter::StandardDeviationPerComponentSampleFilter() @@ -208,7 +206,6 @@ StandardDeviationPerComponentSampleFilter::GetMeanPerComponent() const { return this->GetMeanPerComponentOutput()->Get(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.h b/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.h index c8e01882417..9cd3e1103eb 100644 --- a/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.h +++ b/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.h @@ -20,11 +20,7 @@ #include "itkSubsample.h" -namespace itk -{ -namespace Statistics -{ -namespace Algorithm +namespace itk::Statistics::Algorithm { template TSize @@ -177,9 +173,8 @@ template void IntrospectiveSort(TSubsample * sample, unsigned int activeDimension, int beginIndex, int endIndex, int sizeThreshold); -} // end of namespace Algorithm -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics::Algorithm +// end of namespace Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkStatisticsAlgorithm.hxx" diff --git a/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.hxx b/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.hxx index 3cce56a23fb..a3613b8f4a6 100644 --- a/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.hxx +++ b/Modules/Numerics/Statistics/include/itkStatisticsAlgorithm.hxx @@ -20,11 +20,7 @@ #include "itkNumericTraits.h" -namespace itk -{ -namespace Statistics -{ -namespace Algorithm +namespace itk::Statistics::Algorithm { template inline TSize @@ -653,8 +649,7 @@ IntrospectiveSort(TSubsample * sample, unsigned int activeDimension, int beginIn sample, activeDimension, beginIndex, endIndex, 2 * FloorLog(endIndex - beginIndex), sizeThreshold); InsertSort(sample, activeDimension, beginIndex, endIndex); } -} // end of namespace Algorithm -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics::Algorithm +// end of namespace Statistics #endif // #ifndef itkStatisticsAlgorithm_hxx diff --git a/Modules/Numerics/Statistics/include/itkSubsample.h b/Modules/Numerics/Statistics/include/itkSubsample.h index ac5d380a06d..e13b1cd221d 100644 --- a/Modules/Numerics/Statistics/include/itkSubsample.h +++ b/Modules/Numerics/Statistics/include/itkSubsample.h @@ -22,9 +22,7 @@ #include "itkMacro.h" #include "itkObjectFactory.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class Subsample @@ -291,8 +289,7 @@ class ITK_TEMPLATE_EXPORT Subsample : public TSample unsigned int m_ActiveDimension{}; TotalAbsoluteFrequencyType m_TotalFrequency{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkSubsample.hxx" diff --git a/Modules/Numerics/Statistics/include/itkSubsample.hxx b/Modules/Numerics/Statistics/include/itkSubsample.hxx index 735f91a9534..fd7dda2df2e 100644 --- a/Modules/Numerics/Statistics/include/itkSubsample.hxx +++ b/Modules/Numerics/Statistics/include/itkSubsample.hxx @@ -21,9 +21,7 @@ #include "itkObject.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template Subsample::Subsample() @@ -219,7 +217,6 @@ Subsample::Graft(const DataObject * thatObject) this->m_TotalFrequency = that->m_TotalFrequency; } } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkSubsamplerBase.h b/Modules/Numerics/Statistics/include/itkSubsamplerBase.h index 77802173d1e..815711020ae 100644 --- a/Modules/Numerics/Statistics/include/itkSubsamplerBase.h +++ b/Modules/Numerics/Statistics/include/itkSubsamplerBase.h @@ -22,9 +22,7 @@ #include "itkSample.h" #include "itkSubsample.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class SubsamplerBase @@ -140,8 +138,7 @@ class ITK_TEMPLATE_EXPORT SubsamplerBase : public Object SeedType m_Seed{}; }; // end of class SubsamplerBase -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkSubsamplerBase.hxx" diff --git a/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx b/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx index 06f9ed076fb..7f3b03d2ea9 100644 --- a/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx +++ b/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx @@ -18,9 +18,7 @@ #ifndef itkSubsamplerBase_hxx #define itkSubsamplerBase_hxx -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template @@ -70,7 +68,6 @@ SubsamplerBase::PrintSelf(std::ostream & os, Indent indent) const os << std::endl; } -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkTDistribution.h b/Modules/Numerics/Statistics/include/itkTDistribution.h index 68d29cdd0fa..cebec4a10c5 100644 --- a/Modules/Numerics/Statistics/include/itkTDistribution.h +++ b/Modules/Numerics/Statistics/include/itkTDistribution.h @@ -22,9 +22,7 @@ #include "itkNumericTraits.h" #include "ITKStatisticsExport.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class TDistribution @@ -233,7 +231,6 @@ class ITKStatistics_EXPORT TDistribution : public ProbabilityDistribution void PrintSelf(std::ostream & os, Indent indent) const override; }; // end of class -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h index c38c044f75c..e096f51c088 100644 --- a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h @@ -21,9 +21,7 @@ #include "itkSpatialNeighborSubsampler.h" #include "itkMersenneTwisterRandomVariateGenerator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class UniformRandomSpatialNeighborSubsampler @@ -163,8 +161,7 @@ class ITK_TEMPLATE_EXPORT UniformRandomSpatialNeighborSubsampler : public Spatia bool m_UseClockForSeed{}; }; // end of class UniformRandomSpatialNeighborSubsampler -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkUniformRandomSpatialNeighborSubsampler.hxx" diff --git a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx index 85563d88d5d..55d7d5c4f70 100644 --- a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx +++ b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx @@ -19,9 +19,7 @@ #define itkUniformRandomSpatialNeighborSubsampler_hxx #include -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template @@ -193,7 +191,6 @@ UniformRandomSpatialNeighborSubsampler::PrintSelf(std::ostream os << std::endl; } -} // end namespace Statistics -} // end namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.h index 9163f442583..fc8b654df64 100644 --- a/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.h +++ b/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.h @@ -24,9 +24,7 @@ #include "itkSmartPointer.h" #include "itkVectorContainer.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** \class VectorContainerToListSampleAdaptor * \brief This class provides ListSample interface to ITK VectorContainer @@ -254,8 +252,7 @@ class ITK_TEMPLATE_EXPORT VectorContainerToListSampleAdaptor : public ListSample private: VectorContainerConstPointer m_VectorContainer{}; }; // end of class VectorContainerToListSampleAdaptor -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkVectorContainerToListSampleAdaptor.hxx" diff --git a/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.hxx b/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.hxx index 3aa525529e7..82844122f91 100644 --- a/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.hxx +++ b/Modules/Numerics/Statistics/include/itkVectorContainerToListSampleAdaptor.hxx @@ -18,10 +18,7 @@ #ifndef itkVectorContainerToListSampleAdaptor_hxx #define itkVectorContainerToListSampleAdaptor_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template VectorContainerToListSampleAdaptor::VectorContainerToListSampleAdaptor() @@ -83,7 +80,6 @@ VectorContainerToListSampleAdaptor::GetTotalFrequency() const } return this->Size(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.h b/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.h index 54839ea90bb..9c1a3ca65f7 100644 --- a/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.h +++ b/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.h @@ -23,9 +23,7 @@ #include "itkSubsample.h" #include "itkKdTreeGenerator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class WeightedCentroidKdTreeGenerator @@ -112,8 +110,7 @@ class ITK_TEMPLATE_EXPORT WeightedCentroidKdTreeGenerator : public KdTreeGenerat MeasurementVectorType m_TempUpperBound{}; MeasurementVectorType m_TempMean{}; }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkWeightedCentroidKdTreeGenerator.hxx" diff --git a/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.hxx b/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.hxx index dfd746d329f..5327fc95518 100644 --- a/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.hxx +++ b/Modules/Numerics/Statistics/include/itkWeightedCentroidKdTreeGenerator.hxx @@ -18,10 +18,7 @@ #ifndef itkWeightedCentroidKdTreeGenerator_hxx #define itkWeightedCentroidKdTreeGenerator_hxx - -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template @@ -116,7 +113,6 @@ WeightedCentroidKdTreeGenerator::GenerateNonterminalNode(unsigned int return nonTerminalNode; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.h b/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.h index 4a19be3f19c..448972e483d 100644 --- a/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.h @@ -22,9 +22,7 @@ #include "itkCovarianceSampleFilter.h" #include "itkDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class WeightedCovarianceSampleFilter @@ -115,8 +113,7 @@ class ITK_TEMPLATE_EXPORT WeightedCovarianceSampleFilter : public CovarianceSamp void ComputeCovarianceMatrixWithWeights(); }; // end of class -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #ifndef ITK_MANUAL_INSTANTIATION # include "itkWeightedCovarianceSampleFilter.hxx" diff --git a/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.hxx index 0369069207a..3e40fca9a42 100644 --- a/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkWeightedCovarianceSampleFilter.hxx @@ -20,9 +20,7 @@ #include "itkWeightedMeanSampleFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template WeightedCovarianceSampleFilter::WeightedCovarianceSampleFilter() @@ -250,7 +248,6 @@ WeightedCovarianceSampleFilter::ComputeCovarianceMatrixWithWeights() decoratedOutput->Set(output); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/include/itkWeightedMeanSampleFilter.h b/Modules/Numerics/Statistics/include/itkWeightedMeanSampleFilter.h index 39ccfac5c94..8e38b59f50c 100644 --- a/Modules/Numerics/Statistics/include/itkWeightedMeanSampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkWeightedMeanSampleFilter.h @@ -22,9 +22,7 @@ #include "itkFunctionBase.h" #include "itkDataObjectDecorator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** * \class WeightedMeanSampleFilter @@ -110,8 +108,7 @@ class ITK_TEMPLATE_EXPORT WeightedMeanSampleFilter : public MeanSampleFilter WeightedMeanSampleFilter::WeightedMeanSampleFilter() @@ -180,7 +178,6 @@ WeightedMeanSampleFilter::ComputeMeanWithWeightingFunction() decoratedOutput->Set(output); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics #endif diff --git a/Modules/Numerics/Statistics/src/itkChiSquareDistribution.cxx b/Modules/Numerics/Statistics/src/itkChiSquareDistribution.cxx index 44250781000..4c6024536ed 100644 --- a/Modules/Numerics/Statistics/src/itkChiSquareDistribution.cxx +++ b/Modules/Numerics/Statistics/src/itkChiSquareDistribution.cxx @@ -25,9 +25,7 @@ dgami_(double * a, double * x); extern "C" double dgamma_(double * x); -namespace itk -{ -namespace Statistics +namespace itk::Statistics { ChiSquareDistribution::ChiSquareDistribution() { @@ -315,5 +313,4 @@ ChiSquareDistribution::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Degrees of freedom: (unknown)" << std::endl; } } -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkDecisionRule.cxx b/Modules/Numerics/Statistics/src/itkDecisionRule.cxx index e917abd1e51..ca8a13db282 100644 --- a/Modules/Numerics/Statistics/src/itkDecisionRule.cxx +++ b/Modules/Numerics/Statistics/src/itkDecisionRule.cxx @@ -17,13 +17,10 @@ *=========================================================================*/ #include "itkDecisionRule.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { DecisionRule::DecisionRule() = default; DecisionRule::~DecisionRule() = default; -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkDenseFrequencyContainer2.cxx b/Modules/Numerics/Statistics/src/itkDenseFrequencyContainer2.cxx index c6b3cdcfaa0..9bc74c00734 100644 --- a/Modules/Numerics/Statistics/src/itkDenseFrequencyContainer2.cxx +++ b/Modules/Numerics/Statistics/src/itkDenseFrequencyContainer2.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkDenseFrequencyContainer2.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { DenseFrequencyContainer2::DenseFrequencyContainer2() : m_TotalFrequency(TotalAbsoluteFrequencyType{}) @@ -82,5 +80,4 @@ DenseFrequencyContainer2::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkExpectationMaximizationMixtureModelEstimator.cxx b/Modules/Numerics/Statistics/src/itkExpectationMaximizationMixtureModelEstimator.cxx index 4077bcb950e..95cea7a2744 100644 --- a/Modules/Numerics/Statistics/src/itkExpectationMaximizationMixtureModelEstimator.cxx +++ b/Modules/Numerics/Statistics/src/itkExpectationMaximizationMixtureModelEstimator.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkExpectationMaximizationMixtureModelEstimator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** Print enum values */ std::ostream & @@ -37,5 +35,4 @@ operator<<(std::ostream & out, const ExpectationMaximizationMixtureModelEstimato } }(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkGaussianDistribution.cxx b/Modules/Numerics/Statistics/src/itkGaussianDistribution.cxx index 29fb791b870..24ed09190d0 100644 --- a/Modules/Numerics/Statistics/src/itkGaussianDistribution.cxx +++ b/Modules/Numerics/Statistics/src/itkGaussianDistribution.cxx @@ -19,9 +19,7 @@ #include "vnl/vnl_erf.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { GaussianDistribution::GaussianDistribution() { @@ -442,5 +440,4 @@ GaussianDistribution::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Variance: (unknown)" << std::endl; } } -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkHistogramToRunLengthFeaturesFilter.cxx b/Modules/Numerics/Statistics/src/itkHistogramToRunLengthFeaturesFilter.cxx index f59e3d8043b..5a323177c1e 100644 --- a/Modules/Numerics/Statistics/src/itkHistogramToRunLengthFeaturesFilter.cxx +++ b/Modules/Numerics/Statistics/src/itkHistogramToRunLengthFeaturesFilter.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkHistogramToRunLengthFeaturesFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** Print enum values */ std::ostream & @@ -53,5 +51,4 @@ operator<<(std::ostream & out, const HistogramToRunLengthFeaturesFilterEnums::Ru } }(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkHistogramToTextureFeaturesFilter.cxx b/Modules/Numerics/Statistics/src/itkHistogramToTextureFeaturesFilter.cxx index 6b811ea1990..88f8c1093c2 100644 --- a/Modules/Numerics/Statistics/src/itkHistogramToTextureFeaturesFilter.cxx +++ b/Modules/Numerics/Statistics/src/itkHistogramToTextureFeaturesFilter.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkHistogramToTextureFeaturesFilter.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { /** Print enum values */ std::ostream & @@ -51,5 +49,4 @@ operator<<(std::ostream & out, const HistogramToTextureFeaturesFilterEnums::Text } }(); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkMaximumDecisionRule.cxx b/Modules/Numerics/Statistics/src/itkMaximumDecisionRule.cxx index 9a62a3ba0a5..6db42934fba 100644 --- a/Modules/Numerics/Statistics/src/itkMaximumDecisionRule.cxx +++ b/Modules/Numerics/Statistics/src/itkMaximumDecisionRule.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkMaximumDecisionRule.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { MaximumDecisionRule::ClassIdentifierType MaximumDecisionRule::Evaluate(const MembershipVectorType & discriminantScores) const @@ -41,5 +39,4 @@ MaximumDecisionRule::Evaluate(const MembershipVectorType & discriminantScores) c } return maxIndex; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx b/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx index 74c507402e2..030e7e8a048 100644 --- a/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx +++ b/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx @@ -18,9 +18,7 @@ #include "itkMaximumRatioDecisionRule.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { MaximumRatioDecisionRule::MaximumRatioDecisionRule() = default; @@ -120,5 +118,4 @@ MaximumRatioDecisionRule::Evaluate(const MembershipVectorType & discriminantScor } return besti; } -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkMinimumDecisionRule.cxx b/Modules/Numerics/Statistics/src/itkMinimumDecisionRule.cxx index d89592197cb..b1b63c85d77 100644 --- a/Modules/Numerics/Statistics/src/itkMinimumDecisionRule.cxx +++ b/Modules/Numerics/Statistics/src/itkMinimumDecisionRule.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkMinimumDecisionRule.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { MinimumDecisionRule::ClassIdentifierType MinimumDecisionRule::Evaluate(const MembershipVectorType & discriminantScores) const @@ -41,5 +39,4 @@ MinimumDecisionRule::Evaluate(const MembershipVectorType & discriminantScores) c } return minIndex; } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkNormalVariateGenerator.cxx b/Modules/Numerics/Statistics/src/itkNormalVariateGenerator.cxx index 69e7e9a6ac3..2dc8841be13 100644 --- a/Modules/Numerics/Statistics/src/itkNormalVariateGenerator.cxx +++ b/Modules/Numerics/Statistics/src/itkNormalVariateGenerator.cxx @@ -19,9 +19,7 @@ #include "itkNormalVariateGenerator.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { NormalVariateGenerator::NormalVariateGenerator() : m_Scale(30000000.0) @@ -474,5 +472,4 @@ NormalVariateGenerator::FastNorm() m_ActualRSD = 1.0 / ts; /* Reciprocal of actual Standard Devtn */ goto startpass; } -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkProbabilityDistribution.cxx b/Modules/Numerics/Statistics/src/itkProbabilityDistribution.cxx index c4fc5b0519d..fb32ba48580 100644 --- a/Modules/Numerics/Statistics/src/itkProbabilityDistribution.cxx +++ b/Modules/Numerics/Statistics/src/itkProbabilityDistribution.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkProbabilityDistribution.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { void ProbabilityDistribution::SetParameters(const ParametersType & params) @@ -41,5 +39,4 @@ ProbabilityDistribution::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); os << indent << "Parameters: " << m_Parameters << std::endl; } -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkSparseFrequencyContainer2.cxx b/Modules/Numerics/Statistics/src/itkSparseFrequencyContainer2.cxx index aea3b9c3d9f..aafca854e20 100644 --- a/Modules/Numerics/Statistics/src/itkSparseFrequencyContainer2.cxx +++ b/Modules/Numerics/Statistics/src/itkSparseFrequencyContainer2.cxx @@ -17,9 +17,7 @@ *=========================================================================*/ #include "itkSparseFrequencyContainer2.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { SparseFrequencyContainer2::SparseFrequencyContainer2() : m_TotalFrequency(TotalAbsoluteFrequencyType{}) @@ -86,5 +84,4 @@ SparseFrequencyContainer2::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); } -} // end of namespace Statistics -} // end of namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/src/itkTDistribution.cxx b/Modules/Numerics/Statistics/src/itkTDistribution.cxx index afb1bd59375..8e86967b943 100644 --- a/Modules/Numerics/Statistics/src/itkTDistribution.cxx +++ b/Modules/Numerics/Statistics/src/itkTDistribution.cxx @@ -26,9 +26,7 @@ dbetai_(double * x, double * pin, double * qin); extern "C" double dgamma_(double * x); -namespace itk -{ -namespace Statistics +namespace itk::Statistics { TDistribution::TDistribution() { @@ -364,5 +362,4 @@ TDistribution::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Degrees of freedom: (unknown)" << std::endl; } } -} // end of namespace Statistics -} // end namespace itk +} // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx index ba2fecf0369..179d5aa8d14 100644 --- a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx +++ b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx @@ -20,9 +20,7 @@ #include "itkHistogram.h" #include "itkMahalanobisDistanceMetric.h" -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template class MyCovarianceSampleFilter : public CovarianceSampleFilter @@ -56,8 +54,8 @@ class MyCovarianceSampleFilter : public CovarianceSampleFilter MyCovarianceSampleFilter() = default; ~MyCovarianceSampleFilter() override = default; }; -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics + int itkCovarianceSampleFilterTest3(int, char *[]) diff --git a/Modules/Numerics/Statistics/test/itkDecisionRuleTest.cxx b/Modules/Numerics/Statistics/test/itkDecisionRuleTest.cxx index 3335e6be318..884638117e9 100644 --- a/Modules/Numerics/Statistics/test/itkDecisionRuleTest.cxx +++ b/Modules/Numerics/Statistics/test/itkDecisionRuleTest.cxx @@ -18,13 +18,8 @@ #include "itkDecisionRule.h" -namespace itk +namespace itk::Statistics::DecisionRuleTest { -namespace Statistics -{ -namespace DecisionRuleTest -{ - class MyDecisionRule : public DecisionRule { public: @@ -65,10 +60,8 @@ class MyDecisionRule : public DecisionRule return maxIndex; } }; +} // namespace itk::Statistics::DecisionRuleTest -} // namespace DecisionRuleTest -} // namespace Statistics -} // namespace itk int itkDecisionRuleTest(int, char *[]) { diff --git a/Modules/Numerics/Statistics/test/itkDistanceMetricTest.cxx b/Modules/Numerics/Statistics/test/itkDistanceMetricTest.cxx index 72d60b5ab3e..59c82199049 100644 --- a/Modules/Numerics/Statistics/test/itkDistanceMetricTest.cxx +++ b/Modules/Numerics/Statistics/test/itkDistanceMetricTest.cxx @@ -18,11 +18,7 @@ #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics -{ -namespace DistanceMetricTest +namespace itk::Statistics::DistanceMetricTest { template @@ -57,9 +53,8 @@ class MyDistanceMetric : public DistanceMetric } }; -} // namespace DistanceMetricTest -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::DistanceMetricTest + int itkDistanceMetricTest(int, char *[]) { diff --git a/Modules/Numerics/Statistics/test/itkDistanceMetricTest2.cxx b/Modules/Numerics/Statistics/test/itkDistanceMetricTest2.cxx index 2dc1ffdd86c..b66ca6bd866 100644 --- a/Modules/Numerics/Statistics/test/itkDistanceMetricTest2.cxx +++ b/Modules/Numerics/Statistics/test/itkDistanceMetricTest2.cxx @@ -18,11 +18,7 @@ #include "itkDistanceMetric.h" -namespace itk -{ -namespace Statistics -{ -namespace DistanceMetricTest +namespace itk::Statistics::DistanceMetricTest { template @@ -57,9 +53,8 @@ class MyDistanceMetric : public DistanceMetric } }; -} // namespace DistanceMetricTest -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::DistanceMetricTest + // test DistanceMetric using resizable measurement vector type int diff --git a/Modules/Numerics/Statistics/test/itkMembershipFunctionBaseTest.cxx b/Modules/Numerics/Statistics/test/itkMembershipFunctionBaseTest.cxx index 917ece645a6..c74dbb9aad8 100644 --- a/Modules/Numerics/Statistics/test/itkMembershipFunctionBaseTest.cxx +++ b/Modules/Numerics/Statistics/test/itkMembershipFunctionBaseTest.cxx @@ -19,11 +19,7 @@ #include #include "itkMembershipFunctionBase.h" -namespace itk -{ -namespace Statistics -{ -namespace MembershipFunctionBaseTest +namespace itk::Statistics::MembershipFunctionBaseTest { template @@ -54,9 +50,9 @@ class MyMembershipFunctionBase : public MembershipFunctionBase #include "itkMembershipFunctionBase.h" -namespace itk -{ -namespace Statistics -{ -namespace MembershipFunctionBaseTest +namespace itk::Statistics::MembershipFunctionBaseTest { template @@ -54,9 +50,8 @@ class MyMembershipFunctionBase : public MembershipFunctionBase @@ -59,8 +57,8 @@ class MixtureModelComponentBaseTestHelper : public MixtureModelComponentBase @@ -113,9 +109,9 @@ class MySample : public Sample std::vector m_Frequencies; }; -} // namespace SampleTest -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::SampleTest + + int itkSampleTest(int, char *[]) { diff --git a/Modules/Numerics/Statistics/test/itkSampleTest2.cxx b/Modules/Numerics/Statistics/test/itkSampleTest2.cxx index 6554f0468cc..09c4b3ada20 100644 --- a/Modules/Numerics/Statistics/test/itkSampleTest2.cxx +++ b/Modules/Numerics/Statistics/test/itkSampleTest2.cxx @@ -21,11 +21,7 @@ #include "itkObjectFactory.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics -{ -namespace SampleTest +namespace itk::Statistics::SampleTest { template @@ -120,9 +116,9 @@ class MySample : public Sample std::vector m_Frequencies; }; -} // namespace SampleTest -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::SampleTest + + int itkSampleTest2(int, char *[]) { diff --git a/Modules/Numerics/Statistics/test/itkSampleTest3.cxx b/Modules/Numerics/Statistics/test/itkSampleTest3.cxx index d3f84a571aa..502801c9f48 100644 --- a/Modules/Numerics/Statistics/test/itkSampleTest3.cxx +++ b/Modules/Numerics/Statistics/test/itkSampleTest3.cxx @@ -21,11 +21,7 @@ #include "itkObjectFactory.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics -{ -namespace SampleTest +namespace itk::Statistics::SampleTest { template @@ -121,9 +117,9 @@ class MySample : public Sample std::vector m_Frequencies; }; -} // namespace SampleTest -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::SampleTest + + int itkSampleTest3(int, char *[]) { diff --git a/Modules/Numerics/Statistics/test/itkSampleTest4.cxx b/Modules/Numerics/Statistics/test/itkSampleTest4.cxx index 0db8e193d29..b5be055e7b5 100644 --- a/Modules/Numerics/Statistics/test/itkSampleTest4.cxx +++ b/Modules/Numerics/Statistics/test/itkSampleTest4.cxx @@ -21,11 +21,7 @@ #include "itkObjectFactory.h" #include "itkMath.h" -namespace itk -{ -namespace Statistics -{ -namespace SampleTest +namespace itk::Statistics::SampleTest { template @@ -121,9 +117,9 @@ class MySample : public Sample std::vector m_Frequencies; }; -} // namespace SampleTest -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::SampleTest + + int itkSampleTest4(int, char *[]) { diff --git a/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx b/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx index ed082f6c102..e6af82bd32b 100644 --- a/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx +++ b/Modules/Numerics/Statistics/test/itkSampleToSubsampleFilterTest1.cxx @@ -20,11 +20,7 @@ #include "itkListSample.h" #include "itkSampleToSubsampleFilter.h" -namespace itk -{ -namespace Statistics -{ -namespace itkSampleToSubsampleFilter1Namespace +namespace itk::Statistics::itkSampleToSubsampleFilter1Namespace { template @@ -60,9 +56,7 @@ class SubsamplerTester : public SampleToSubsampleFilter private: }; -} // namespace itkSampleToSubsampleFilter1Namespace -} // namespace Statistics -} // namespace itk +} // namespace itk::Statistics::itkSampleToSubsampleFilter1Namespace int diff --git a/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx b/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx index f8c981bab51..a3f5a0f1269 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx @@ -23,9 +23,7 @@ constexpr unsigned int MeasurementVectorSize = 3; using MeasurementVectorType = itk::FixedArray; -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template class MyWeightedCovarianceSampleFilter : public WeightedCovarianceSampleFilter @@ -51,8 +49,8 @@ class MyWeightedCovarianceSampleFilter : public WeightedCovarianceSampleFilter; -namespace itk -{ -namespace Statistics +namespace itk::Statistics { template class MyWeightedCovarianceSampleFilter : public WeightedCovarianceSampleFilter @@ -51,8 +49,7 @@ class MyWeightedCovarianceSampleFilter : public WeightedCovarianceSampleFilter @@ -154,7 +152,7 @@ class ImageRegistrationMethodImageSource : public itk::Object ParametersType m_Parameters{}; }; -} // end namespace testhelper +} // namespace itk::testhelper -} // end namespace itk +// end namespace itk #endif diff --git a/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.h b/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.h index 9b90623dc5d..448cfeb0bef 100644 --- a/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.h +++ b/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.h @@ -37,9 +37,7 @@ #include "itkNCCRegistrationFunction.h" #include "itkMIRegistrationFunction.h" -namespace itk -{ -namespace fem +namespace itk::fem { /** @@ -340,8 +338,7 @@ class ITK_TEMPLATE_EXPORT FiniteDifferenceFunctionLoad : public LoadElement typename DisplacementFieldType::Pointer m_DisplacementField{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkFEMFiniteDifferenceFunctionLoad.hxx" diff --git a/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx b/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx index d84a128993c..afb22318bca 100644 --- a/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx +++ b/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx @@ -18,10 +18,7 @@ #ifndef itkFEMFiniteDifferenceFunctionLoad_hxx #define itkFEMFiniteDifferenceFunctionLoad_hxx - -namespace itk -{ -namespace fem +namespace itk::fem { template @@ -372,7 +369,6 @@ FiniteDifferenceFunctionLoad::PrintSelf(std::ostream & os, Inde itkPrintSelfObjectMacro(DifferenceFunction); itkPrintSelfObjectMacro(DisplacementField); } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h index 205d0b28515..1b2ef51df03 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h @@ -51,9 +51,7 @@ #include #include -namespace itk -{ -namespace fem +namespace itk::fem { /** \class FEMRegistrationFilterEnums * \brief Contains all enum classes used by FEMRegistrationFilter class. @@ -746,8 +744,7 @@ class ITK_TEMPLATE_EXPORT FEMRegistrationFilter : public ImageToImageFilter @@ -1522,7 +1520,6 @@ FEMRegistrationFilter::PrintSelf(std::ost << static_cast::PrintType>(m_StandardDeviations) << std::endl; } -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #endif diff --git a/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h b/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h index ca0d66299fc..4307e7b653b 100644 --- a/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h +++ b/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h @@ -25,10 +25,7 @@ #include "itkFEMScatteredDataPointSetToImageFilter.h" #include "itkConceptChecking.h" - -namespace itk -{ -namespace fem +namespace itk::fem { /** \class PhysicsBasedNonRigidRegistrationMethod @@ -170,8 +167,7 @@ class ITK_TEMPLATE_EXPORT PhysicsBasedNonRigidRegistrationMethod typename BlockMatchingFilterType::Pointer m_BlockMatchingFilter{}; typename FEMFilterType::Pointer m_FEMFilter{}; }; -} // end namespace fem -} // end namespace itk +} // namespace itk::fem #ifndef ITK_MANUAL_INSTANTIATION # include "itkPhysicsBasedNonRigidRegistrationMethod.hxx" diff --git a/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.hxx b/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.hxx index ccc534bc86c..bc81dc29ed7 100644 --- a/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.hxx +++ b/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.hxx @@ -21,11 +21,7 @@ #include #include "itkTimeProbe.h" - -namespace itk -{ - -namespace fem +namespace itk::fem { template @@ -117,7 +113,6 @@ PhysicsBasedNonRigidRegistrationMethod @@ -105,8 +104,8 @@ class SimpleTestFilter : public DenseFiniteDifferenceImageFilter } }; -} // namespace SPSLSF -} // namespace itk +} // namespace itk::SPSLSF + int itkShapePriorSegmentationLevelSetFunctionTest(int, char *[]) diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.h b/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.h index be74e274d4c..cd2a844af9c 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.h @@ -25,9 +25,7 @@ #include "itkProcessObject.h" #include -namespace itk -{ -namespace watershed +namespace itk::watershed { /** \class Boundary * \par @@ -275,8 +273,7 @@ class ITK_TEMPLATE_EXPORT Boundary : public DataObject * information. */ std::vector> m_Valid{}; }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedBoundary.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.hxx index 4ebe1fba1ab..2979b517956 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedBoundary.hxx @@ -21,9 +21,7 @@ #include "itkImageRegionIterator.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { template Boundary::Boundary() @@ -59,6 +57,5 @@ Boundary::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.h b/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.h index 76d77186c09..d89b261ec0a 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.h @@ -21,9 +21,7 @@ #include "itkWatershedSegmenter.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class BoundaryResolver @@ -162,8 +160,7 @@ class ITK_TEMPLATE_EXPORT BoundaryResolver : public ProcessObject GenerateOutputRequestedRegion(DataObject * itkNotUsed(output)) override {} }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedBoundaryResolver.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.hxx index 356e63a47b1..d36fa9e86f8 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedBoundaryResolver.hxx @@ -20,9 +20,7 @@ #include "itkImageRegionIterator.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { template void @@ -104,7 +102,6 @@ BoundaryResolver::PrintSelf(std::ostream & os, Indent in os << indent << "Face: " << m_Face << std::endl; } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.h b/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.h index 8885d437438..f87b38a68e2 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.h @@ -20,9 +20,7 @@ #include "itkWatershedSegmenter.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class EquivalenceRelabeler @@ -143,8 +141,7 @@ class ITK_TEMPLATE_EXPORT EquivalenceRelabeler : public ProcessObject void GenerateInputRequestedRegion() override; }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedEquivalenceRelabeler.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx index f41b0d4039b..912b2084bff 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx @@ -19,9 +19,7 @@ #define itkWatershedEquivalenceRelabeler_hxx #include "itkImageRegionIterator.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { template void @@ -117,7 +115,6 @@ EquivalenceRelabeler::MakeOutput(DataObjectPointerArra { return ImageType::New().GetPointer(); } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.h b/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.h index e2441251483..cd61e7be88c 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.h @@ -21,9 +21,7 @@ #include "itkWatershedSegmentTree.h" #include "itkWatershedSegmenter.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class Relabeler @@ -165,8 +163,7 @@ class ITK_TEMPLATE_EXPORT Relabeler : public ProcessObject void GenerateInputRequestedRegion() override; }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedRelabeler.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.hxx index 376fb9b5bb1..59dec775a29 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedRelabeler.hxx @@ -20,9 +20,7 @@ #include "itkImageRegionIterator.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { template Relabeler::Relabeler() @@ -181,7 +179,6 @@ Relabeler::PrintSelf(std::ostream & os, Indent indent) Superclass::PrintSelf(os, indent); os << indent << "FloodLevel: " << m_FloodLevel << std::endl; } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h index 2bf39c72ea2..4ca5078afd2 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h @@ -23,9 +23,7 @@ #include #include "itkOneWayEquivalencyTable.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class SegmentTable @@ -276,8 +274,7 @@ class ITK_TEMPLATE_EXPORT SegmentTable : public DataObject operator=(const Self &) {} }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedSegmentTable.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.hxx index 2951778c7d6..a5047ed0765 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.hxx @@ -18,10 +18,7 @@ #ifndef itkWatershedSegmentTable_hxx #define itkWatershedSegmentTable_hxx - -namespace itk -{ -namespace watershed +namespace itk::watershed { template void @@ -68,7 +65,6 @@ SegmentTable::Add(IdentifierType a, const segment_t & t) return true; } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.h b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.h index 6ede5f0dfdb..2dd090cf33a 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.h @@ -22,9 +22,7 @@ #include #include -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class SegmentTree @@ -222,8 +220,7 @@ class ITK_TEMPLATE_EXPORT SegmentTree : public DataObject DequeType m_Deque{}; }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedSegmentTree.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.hxx index faf4c19c0db..5551aeb7e10 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTree.hxx @@ -18,10 +18,7 @@ #ifndef itkWatershedSegmentTree_hxx #define itkWatershedSegmentTree_hxx - -namespace itk -{ -namespace watershed +namespace itk::watershed { @@ -47,7 +44,6 @@ SegmentTree::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h index e9c26e6be73..8e10d0199d5 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h @@ -25,9 +25,7 @@ #include #include -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class SegmentTreeGenerator @@ -244,8 +242,7 @@ class ITK_TEMPLATE_EXPORT SegmentTreeGenerator : public ProcessObject * updates. */ double m_HighestCalculatedFloodLevel{ 0.0 }; }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedSegmentTreeGenerator.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx index 6ce89e9ac7f..734a8591724 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx @@ -21,9 +21,7 @@ #include #include "itkOneWayEquivalencyTable.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { template SegmentTreeGenerator::SegmentTreeGenerator() @@ -580,7 +578,6 @@ SegmentTreeGenerator::PrintSelf(std::ostream & os, Indent indent) const os << indent << "ConsumeInput: " << m_ConsumeInput << std::endl; os << indent << "HighestCalculatedFloodLevel: " << m_HighestCalculatedFloodLevel << std::endl; } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.h b/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.h index 0aec958be32..2a7a66ca844 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.h @@ -23,9 +23,7 @@ #include "itkWatershedSegmentTable.h" #include "itkEquivalencyTable.h" -namespace itk -{ -namespace watershed +namespace itk::watershed { /** * \class Segmenter @@ -407,8 +405,7 @@ class ITK_TEMPLATE_EXPORT Segmenter : public ProcessObject double m_MaximumFloodLevel{}; IdentifierType m_CurrentLabel{}; }; -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #ifndef ITK_MANUAL_INSTANTIATION # include "itkWatershedSegmenter.hxx" diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.hxx index 4a249a86ce4..293af4f049e 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.hxx @@ -24,9 +24,7 @@ #include #include -namespace itk -{ -namespace watershed +namespace itk::watershed { /* @@ -1331,7 +1329,6 @@ Segmenter::PrintSelf(std::ostream & os, Indent indent) const os << indent << "MaximumFloodLevel: " << m_MaximumFloodLevel << std::endl; os << indent << "CurrentLabel: " << m_CurrentLabel << std::endl; } -} // end namespace watershed -} // end namespace itk +} // namespace itk::watershed #endif diff --git a/Modules/Video/Core/test/itkTemporalProcessObjectTest.cxx b/Modules/Video/Core/test/itkTemporalProcessObjectTest.cxx index 85be2e7cec5..d71a446ab03 100644 --- a/Modules/Video/Core/test/itkTemporalProcessObjectTest.cxx +++ b/Modules/Video/Core/test/itkTemporalProcessObjectTest.cxx @@ -24,9 +24,8 @@ /** Set up dummy implementations of TemporalProcessObject and * TemporalDataObject for testing */ -namespace itk -{ -namespace TemporalProcessObjectTest + +namespace itk::TemporalProcessObjectTest { using SizeValueType = itk::SizeValueType; @@ -519,8 +518,7 @@ class DummyTemporalProcessObject : public TemporalProcessObject SizeValueType m_IdNumber{ 0 }; }; -} // end namespace TemporalProcessObjectTest -} // end namespace itk +} // namespace itk::TemporalProcessObjectTest int diff --git a/Modules/Video/Core/test/itkVideoSourceTest.cxx b/Modules/Video/Core/test/itkVideoSourceTest.cxx index 33270db997b..3e0e0ab7e8a 100644 --- a/Modules/Video/Core/test/itkVideoSourceTest.cxx +++ b/Modules/Video/Core/test/itkVideoSourceTest.cxx @@ -27,9 +27,7 @@ using FrameType = itk::Image; using VideoType = itk::VideoStream; using SizeValueType = itk::SizeValueType; -namespace itk -{ -namespace VideoSourceTest +namespace itk::VideoSourceTest { /** * \class DummyVideoSource @@ -136,8 +134,7 @@ CreateEmptyFrame() return out; } -} // end namespace VideoSourceTest -} // end namespace itk +} // namespace itk::VideoSourceTest /** * Test the basic functionality of temporal data objects diff --git a/Modules/Video/Core/test/itkVideoToVideoFilterTest.cxx b/Modules/Video/Core/test/itkVideoToVideoFilterTest.cxx index e951bacdb3a..16ed1abd5fa 100644 --- a/Modules/Video/Core/test/itkVideoToVideoFilterTest.cxx +++ b/Modules/Video/Core/test/itkVideoToVideoFilterTest.cxx @@ -30,9 +30,7 @@ using OutputFrameType = itk::Image; using OutputVideoType = itk::VideoStream; using SizeValueType = itk::SizeValueType; -namespace itk -{ -namespace VideoToVideoFilterTest +namespace itk::VideoToVideoFilterTest { /** @@ -155,8 +153,7 @@ class DummyVideoToVideoFilter : public VideoToVideoFilter; using ReaderType = itk::VideoFileReader; using WriterType = itk::VideoFileWriter; -namespace itk -{ -namespace DecimateFramesVideoFilterTest +namespace itk::DecimateFramesVideoFilterTest { /** @@ -63,8 +61,7 @@ FramesAreEqual(const FrameType * f1, const FrameType * f2) return true; } -} // namespace DecimateFramesVideoFilterTest -} // namespace itk +} // namespace itk::DecimateFramesVideoFilterTest /** diff --git a/Modules/Video/Filtering/test/itkFrameAverageVideoFilterTest.cxx b/Modules/Video/Filtering/test/itkFrameAverageVideoFilterTest.cxx index cc3e64c0e9c..08d3bd5e3f0 100644 --- a/Modules/Video/Filtering/test/itkFrameAverageVideoFilterTest.cxx +++ b/Modules/Video/Filtering/test/itkFrameAverageVideoFilterTest.cxx @@ -38,9 +38,8 @@ using SizeValueType = itk::SizeValueType; /** * Helper function */ -namespace itk -{ -namespace FrameAverageVideoFilterTest + +namespace itk::FrameAverageVideoFilterTest { /** @@ -73,8 +72,7 @@ CreateInputFrame(InputPixelType val) return out; } -} // end namespace FrameAverageVideoFilterTest -} // end namespace itk +} // namespace itk::FrameAverageVideoFilterTest /** diff --git a/Modules/Video/Filtering/test/itkFrameDifferenceVideoFilterTest.cxx b/Modules/Video/Filtering/test/itkFrameDifferenceVideoFilterTest.cxx index 2b76b729e9e..74bca53bdbc 100644 --- a/Modules/Video/Filtering/test/itkFrameDifferenceVideoFilterTest.cxx +++ b/Modules/Video/Filtering/test/itkFrameDifferenceVideoFilterTest.cxx @@ -38,9 +38,8 @@ using SizeValueType = itk::SizeValueType; /** * Helper function */ -namespace itk -{ -namespace FrameDifferenceVideoFilterTest + +namespace itk::FrameDifferenceVideoFilterTest { /** @@ -73,8 +72,7 @@ CreateInputFrame(InputPixelType val) return out; } -} // end namespace FrameDifferenceVideoFilterTest -} // end namespace itk +} // namespace itk::FrameDifferenceVideoFilterTest /** diff --git a/Utilities/KWStyle/ITK.kws.xml b/Utilities/KWStyle/ITK.kws.xml index ab88fb50698..e7d98279b20 100644 --- a/Utilities/KWStyle/ITK.kws.xml +++ b/Utilities/KWStyle/ITK.kws.xml @@ -10,7 +10,7 @@ 1 3 /**, *, */,true -itk + [NameOfClass],itk [NameOfClass]_[Extension] 2