STYLE: Prefer constexpr for const numeric literals

hjmjohnson · hjmjohnson · commit 6de307a7d289 · 2018-02-13T08:25:59.000-06:00
Use constexpr for constant numeric literals.
diff --git a/test/CoocurrenceTextureFeaturesImageFilterInstantiationTest.cxx b/test/CoocurrenceTextureFeaturesImageFilterInstantiationTest.cxx
@@ -33,8 +33,8 @@ int CoocurrenceTextureFeaturesImageFilterInstantiationTest( int argc, char *argv
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 8;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 8;
 
   // Declare types
   using InputPixelType = int;
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTest.cxx b/test/CoocurrenceTextureFeaturesImageFilterTest.cxx
@@ -35,8 +35,8 @@ int CoocurrenceTextureFeaturesImageFilterTest( int argc, char *argv[] )
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 8;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 8;
 
   // Declare types
   using InputPixelType = float;
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures.cxx
@@ -41,8 +41,8 @@ int CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *a
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 8;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 8;
 
   // Declare types
   using InputPixelType = int;
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx
@@ -43,8 +43,8 @@ int CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int ar
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 8;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 8;
 
   // Declare types
   using InputPixelType = float;
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestWithVectorImage.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestWithVectorImage.cxx
@@ -40,7 +40,7 @@ int CoocurrenceTextureFeaturesImageFilterTestWithVectorImage( int argc, char *ar
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
+  constexpr unsigned int ImageDimension = 3;
 
   // Declare types
   using InputPixelType = int;
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestWithoutMask.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestWithoutMask.cxx
@@ -39,8 +39,8 @@ int CoocurrenceTextureFeaturesImageFilterTestWithoutMask( int argc, char *argv[]
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 8;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 8;
 
   // Declare types
   using InputPixelType = float;
diff --git a/test/RunLengthTextureFeaturesImageFilterInstantiationTest.cxx b/test/RunLengthTextureFeaturesImageFilterInstantiationTest.cxx
@@ -33,8 +33,8 @@ int RunLengthTextureFeaturesImageFilterInstantiationTest( int argc, char *argv[]
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 10;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 10;
 
   // Declare types
   using InputPixelType = int;
diff --git a/test/RunLengthTextureFeaturesImageFilterTest.cxx b/test/RunLengthTextureFeaturesImageFilterTest.cxx
@@ -42,8 +42,8 @@ int RunLengthTextureFeaturesImageFilterTest( int argc, char *argv[] )
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 10;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 10;
 
   // Declare types
   using InputPixelType = float;
diff --git a/test/RunLengthTextureFeaturesImageFilterTestSeparateFeatures.cxx b/test/RunLengthTextureFeaturesImageFilterTestSeparateFeatures.cxx
@@ -43,8 +43,8 @@ int RunLengthTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *arg
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 10;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 10;
 
   // Declare types
   using InputPixelType = float;
diff --git a/test/RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx b/test/RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx
@@ -45,8 +45,8 @@ int RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int argc
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 10;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 10;
 
   // Declare types
   using InputPixelType = int;
diff --git a/test/RunLengthTextureFeaturesImageFilterTestWithVectorImage.cxx b/test/RunLengthTextureFeaturesImageFilterTestWithVectorImage.cxx
@@ -42,7 +42,7 @@ int RunLengthTextureFeaturesImageFilterTestWithVectorImage( int argc, char *argv
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
+  constexpr unsigned int ImageDimension = 3;
 
   // Declare types
   using InputPixelType = int;
diff --git a/test/RunLengthTextureFeaturesImageFilterTestWithoutMask.cxx b/test/RunLengthTextureFeaturesImageFilterTestWithoutMask.cxx
@@ -41,8 +41,8 @@ int RunLengthTextureFeaturesImageFilterTestWithoutMask( int argc, char *argv[] )
     return EXIT_FAILURE;
     }
 
-  const unsigned int ImageDimension = 3;
-  const unsigned int VectorComponentDimension = 10;
+  constexpr unsigned int ImageDimension = 3;
+  constexpr unsigned int VectorComponentDimension = 10;
 
   // Declare types
   using InputPixelType = float;
diff --git a/test/itkFirstOrderTextureFeaturesImageFilterGTest.cxx b/test/itkFirstOrderTextureFeaturesImageFilterGTest.cxx
@@ -42,7 +42,7 @@ out << "entropy: " << p[7] << std::endl;
 
 TEST(TextureFeatures, FirstOrder_Test1)
 {
-  const unsigned int ImageDimension = 2;
+  constexpr unsigned int ImageDimension = 2;
   using ImageType = itk::Image<float, ImageDimension >;
   using OImageType = itk::Image<itk::FixedArray<float,8>, ImageDimension >;
   using KernelType = itk::FlatStructuringElement< ImageDimension >;
@@ -112,7 +112,7 @@ TEST(TextureFeatures, FirstOrder_Test1)
 
 TEST(TextureFeatures, FirstOrder_Test2)
 {
-  const unsigned int ImageDimension = 2;
+  constexpr unsigned int ImageDimension = 2;
   using ImageType = itk::Image<float, ImageDimension >;
   using OImageType = itk::Image<itk::FixedArray<float,8>, ImageDimension >;
   using KernelType = itk::FlatStructuringElement< ImageDimension >;
diff --git a/test/itkFirstOrderTextureFeaturesImageFilterTest.cxx b/test/itkFirstOrderTextureFeaturesImageFilterTest.cxx
@@ -24,7 +24,7 @@
 
 static void Test1( const std::string &inFileName, const std::string &outFileName )
 {
-  const unsigned int ImageDimension = 3;
+  constexpr unsigned int ImageDimension = 3;
   using ImageType = itk::Image<unsigned char, ImageDimension >;
   using OImageType = itk::Image<itk::FixedArray<float,8>, ImageDimension >;
   using KernelType = itk::FlatStructuringElement< ImageDimension >;
@@ -57,7 +57,7 @@ static void Test1( const std::string &inFileName, const std::string &outFileName
 
 static void Test2( std::string inFileName )
 {
-  const unsigned int ImageDimension = 3;
+  constexpr unsigned int ImageDimension = 3;
   using ImageType = itk::Image<unsigned char, ImageDimension >;
   using OImageType = itk::VectorImage<float, ImageDimension >;
   using KernelType = itk::FlatStructuringElement< ImageDimension >;

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ int CoocurrenceTextureFeaturesImageFilterInstantiationTest( int argc, char *argv`
`33`	`33`	`return EXIT_FAILURE;`
`34`	`34`	`}`
`35`	`35`
`36`		`- const unsigned int ImageDimension = 3;`
`37`		`- const unsigned int VectorComponentDimension = 8;`
	`36`	`+ constexpr unsigned int ImageDimension = 3;`
	`37`	`+ constexpr unsigned int VectorComponentDimension = 8;`
`38`	`38`
`39`	`39`	`// Declare types`
`40`	`40`	`using InputPixelType = int;`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ int CoocurrenceTextureFeaturesImageFilterTest( int argc, char *argv[] )`
`35`	`35`	`return EXIT_FAILURE;`
`36`	`36`	`}`
`37`	`37`
`38`		`- const unsigned int ImageDimension = 3;`
`39`		`- const unsigned int VectorComponentDimension = 8;`
	`38`	`+ constexpr unsigned int ImageDimension = 3;`
	`39`	`+ constexpr unsigned int VectorComponentDimension = 8;`
`40`	`40`
`41`	`41`	`// Declare types`
`42`	`42`	`using InputPixelType = float;`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ int CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *a`
`41`	`41`	`return EXIT_FAILURE;`
`42`	`42`	`}`
`43`	`43`
`44`		`- const unsigned int ImageDimension = 3;`
`45`		`- const unsigned int VectorComponentDimension = 8;`
	`44`	`+ constexpr unsigned int ImageDimension = 3;`
	`45`	`+ constexpr unsigned int VectorComponentDimension = 8;`
`46`	`46`
`47`	`47`	`// Declare types`
`48`	`48`	`using InputPixelType = int;`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ int CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int ar`
`43`	`43`	`return EXIT_FAILURE;`
`44`	`44`	`}`
`45`	`45`
`46`		`- const unsigned int ImageDimension = 3;`
`47`		`- const unsigned int VectorComponentDimension = 8;`
	`46`	`+ constexpr unsigned int ImageDimension = 3;`
	`47`	`+ constexpr unsigned int VectorComponentDimension = 8;`
`48`	`48`
`49`	`49`	`// Declare types`
`50`	`50`	`using InputPixelType = float;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ int CoocurrenceTextureFeaturesImageFilterTestWithVectorImage( int argc, char *ar`
`40`	`40`	`return EXIT_FAILURE;`
`41`	`41`	`}`
`42`	`42`
`43`		`- const unsigned int ImageDimension = 3;`
	`43`	`+ constexpr unsigned int ImageDimension = 3;`
`44`	`44`
`45`	`45`	`// Declare types`
`46`	`46`	`using InputPixelType = int;`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ int CoocurrenceTextureFeaturesImageFilterTestWithoutMask( int argc, char *argv[]`
`39`	`39`	`return EXIT_FAILURE;`
`40`	`40`	`}`
`41`	`41`
`42`		`- const unsigned int ImageDimension = 3;`
`43`		`- const unsigned int VectorComponentDimension = 8;`
	`42`	`+ constexpr unsigned int ImageDimension = 3;`
	`43`	`+ constexpr unsigned int VectorComponentDimension = 8;`
`44`	`44`
`45`	`45`	`// Declare types`
`46`	`46`	`using InputPixelType = float;`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ int RunLengthTextureFeaturesImageFilterInstantiationTest( int argc, char *argv[]`
`33`	`33`	`return EXIT_FAILURE;`
`34`	`34`	`}`
`35`	`35`
`36`		`- const unsigned int ImageDimension = 3;`
`37`		`- const unsigned int VectorComponentDimension = 10;`
	`36`	`+ constexpr unsigned int ImageDimension = 3;`
	`37`	`+ constexpr unsigned int VectorComponentDimension = 10;`
`38`	`38`
`39`	`39`	`// Declare types`
`40`	`40`	`using InputPixelType = int;`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ int RunLengthTextureFeaturesImageFilterTest( int argc, char *argv[] )`
`42`	`42`	`return EXIT_FAILURE;`
`43`	`43`	`}`
`44`	`44`
`45`		`- const unsigned int ImageDimension = 3;`
`46`		`- const unsigned int VectorComponentDimension = 10;`
	`45`	`+ constexpr unsigned int ImageDimension = 3;`
	`46`	`+ constexpr unsigned int VectorComponentDimension = 10;`
`47`	`47`
`48`	`48`	`// Declare types`
`49`	`49`	`using InputPixelType = float;`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ int RunLengthTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *arg`
`43`	`43`	`return EXIT_FAILURE;`
`44`	`44`	`}`
`45`	`45`
`46`		`- const unsigned int ImageDimension = 3;`
`47`		`- const unsigned int VectorComponentDimension = 10;`
	`46`	`+ constexpr unsigned int ImageDimension = 3;`
	`47`	`+ constexpr unsigned int VectorComponentDimension = 10;`
`48`	`48`
`49`	`49`	`// Declare types`
`50`	`50`	`using InputPixelType = float;`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ int RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int argc`
`45`	`45`	`return EXIT_FAILURE;`
`46`	`46`	`}`
`47`	`47`
`48`		`- const unsigned int ImageDimension = 3;`
`49`		`- const unsigned int VectorComponentDimension = 10;`
	`48`	`+ constexpr unsigned int ImageDimension = 3;`
	`49`	`+ constexpr unsigned int VectorComponentDimension = 10;`
`50`	`50`
`51`	`51`	`// Declare types`
`52`	`52`	`using InputPixelType = int;`