COMP: Use one definition rule for constants.

InsightSoftwareConsortium · Feb 29, 2020 · b88892a · b88892a
1 parent c88693b
commit b88892a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/include/itkAnalyzeObjectEntry.h b/include/itkAnalyzeObjectEntry.h
@@ -33,6 +33,18 @@
 
 namespace itk
 {
+constexpr const char * const ANALYZE_OBJECT_LABEL_MAP_ENTRY_ARRAY{"ANALYZE_OBJECT_LABEL_MAP_ENTRY_ARRAY"};
+/**
+ * Constants representing the current version number of the object map file for Analyze
+ */
+constexpr int VERSION1{880102};
+constexpr int VERSION2{880801};
+constexpr int VERSION3{890102};
+constexpr int VERSION4{900302};
+constexpr int VERSION5{910402};
+constexpr int VERSION6{910926};
+constexpr int VERSION7{20050829};
+
 
 /**
  * \class AnalyzeObjectEntry

diff --git a/include/itkAnalyzeObjectLabelMapImageIO.h b/include/itkAnalyzeObjectLabelMapImageIO.h
@@ -31,17 +31,6 @@
 namespace itk
 {
 using AnalyzeObjectEntryArrayType = std::vector<AnalyzeObjectEntry::Pointer>;
-const char * const ANALYZE_OBJECT_LABEL_MAP_ENTRY_ARRAY = "ANALYZE_OBJECT_LABEL_MAP_ENTRY_ARRAY";
-/**
- * Constants representing the current version number of the object map file for Analyze
- */
-constexpr int    VERSION1 = 880102;
-constexpr int    VERSION2 = 880801;
-constexpr int    VERSION3 = 890102;
-static const int VERSION4 = 900302;
-static const int VERSION5 = 910402;
-static const int VERSION6 = 910926;
-static const int VERSION7 = 20050829;
 
 /**
  * Buffer size for reading in the run length encoded object data

diff --git a/include/itkAnalyzeObjectMap.h b/include/itkAnalyzeObjectMap.h
@@ -27,18 +27,6 @@
 #include "itkMetaDataObject.h"
 #include "itkThresholdImageFilter.h"
 
-constexpr char * const ANALYZE_OBJECT_LABEL_MAP_ENTRY_ARRAY = "ANALYZE_OBJECT_LABEL_MAP_ENTRY_ARRAY";
-/**
- * Constants representing the current version number of the object map file for Analyze
- */
-constexpr int VERSION1 = 880102;
-constexpr int VERSION2 = 880801;
-constexpr int VERSION3 = 890102;
-constexpr int VERSION4 = 900302;
-constexpr int VERSION5 = 910402;
-constexpr int VERSION6 = 910926;
-constexpr int VERSION7 = 20050829;
-
 namespace itk
 {