Merge pull request InsightSoftwareConsortium#6280 from blowekamp/fix-PrintHelper-remove-from-macro-chain

COMP: Fix PrintNumericTrait build error in debug mode

Author: blowekamp

Modules/Core/Common/include/itkCovariantVector.h

@@ -18,7 +18,6 @@
 #ifndef itkCovariantVector_h
 #define itkCovariantVector_h
 
-#include "itkIndent.h"
 #include "itkVector.h"
 #include "vnl/vnl_vector_ref.h"
 

Modules/Core/Common/include/itkIndent.h

@@ -28,7 +28,8 @@
 #ifndef itkIndent_h
 #define itkIndent_h
 
-#include "itkMacro.h"
+#include "ITKCommonExport.h"
+
 #include <iostream>
 
 namespace itk

Modules/Core/Common/include/itkMacro.h

@@ -48,7 +48,6 @@
 #include <cstdlib>
 #ifndef NDEBUG
 #  include <cassert>
-#  include "itkPrintHelper.h" // for ostream operator<<std::vector<T>
 #endif
 
 #include <sstream>
@@ -1581,4 +1580,7 @@ ContainerCopyWithCheck(MemberContainerType & m, const CopyFromContainerType & c,
 
 
 #undef allow_inclusion_of_itkExceptionObject_h
+
+
+#include "itkPrintHelper.h"
 #endif // itkMacro_h

Modules/Core/Common/include/itkPrintHelper.h

@@ -19,6 +19,7 @@
 #ifndef itkPrintHelper_h
 #define itkPrintHelper_h
 
+#include "itkMacro.h"
 #include "itkIndent.h"
 
 #include <array>
@@ -38,8 +39,6 @@ namespace itk
 // sites already #include "itkNumericTraits.h" directly or transitively.
 template <typename T>
 class NumericTraits;
-// Same circular-include guard as NumericTraits<T> above.
-class Indent;
 } // namespace itk
 
 namespace itk::print_helper

Modules/Core/Common/include/itkRGBAPixel.h

@@ -23,7 +23,6 @@
 #  undef RGBAPixel
 #endif
 
-#include "itkIndent.h"
 #include "itkFixedArray.h"
 #include "itkMath.h"
 

Modules/Core/Common/include/itkRGBPixel.h

@@ -23,7 +23,6 @@
 #  undef RGBPixel
 #endif
 
-#include "itkIndent.h"
 #include "itkFixedArray.h"
 #include "itkMath.h"
 

Modules/Core/Common/include/itkSymmetricSecondRankTensor.h

@@ -23,7 +23,6 @@
 #  undef SymmetricSecondRankTensor
 #endif
 
-#include "itkIndent.h"
 #include "itkFixedArray.h"
 #include "itkMatrix.h"
 #include "itkSymmetricEigenAnalysis.h"

Modules/Core/Common/test/itkTimeProbeTest.cxx

@@ -17,7 +17,6 @@
  *=========================================================================*/
 
 #include <iostream>
-#include "itkIndent.h"
 #include "itkTimeProbe.h"
 #include "itkMath.h"