COMP: Fix compiling an app with Clang when ITK is built with GCC

InsightSoftwareConsortium · Jan 16, 2020 · eb8ce3c · eb8ce3c
1 parent 6135513
commit eb8ce3c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Modules/Core/Common/include/itkQuadrilateralCell.h b/Modules/Core/Common/include/itkQuadrilateralCell.h
@@ -138,7 +138,7 @@ class ITK_TEMPLATE_EXPORT QuadrilateralCell
     }
   }
 
-#if defined(__GNUC__) && (__GNUC__ > 5)
+#if defined(__GNUC__) && (__GNUC__ > 5) || defined(__clang__)
   ~QuadrilateralCell() override = default;
 #else
   ~QuadrilateralCell() override{};

diff --git a/Modules/Core/Common/include/itkTriangleCell.h b/Modules/Core/Common/include/itkTriangleCell.h
@@ -150,7 +150,7 @@ class ITK_TEMPLATE_EXPORT TriangleCell
   TriangleCell()
     : m_PointIds(NumberOfPoints, NumericTraits<PointIdentifier>::max())
   {}
-#if defined(__GNUC__) && (__GNUC__ > 5)
+#if defined(__GNUC__) && (__GNUC__ > 5) || defined(__clang__)
   ~TriangleCell() override = default;
 #else
   ~TriangleCell() override{};

diff --git a/Modules/Core/Transform/include/itkTransform.h b/Modules/Core/Transform/include/itkTransform.h
@@ -552,7 +552,7 @@ class ITK_TEMPLATE_EXPORT Transform : public TransformBaseTemplate<TParametersVa
 
   Transform();
   Transform(NumberOfParametersType NumberOfParameters);
-#if defined(__GNUC__) && __GNUC__ < 6
+#if defined(__GNUC__) && __GNUC__ < 6 && !defined(__clang__)
   ~Transform() override{};
 #else
   ~Transform() override = default;

diff --git a/Modules/Core/Transform/include/itkTransformBase.h b/Modules/Core/Transform/include/itkTransformBase.h
@@ -151,7 +151,7 @@ class TransformBaseTemplate : public Object
   GetTransformCategory() const = 0;
 
 protected:
-#if defined(__GNUC__) && __GNUC__ < 6
+#if defined(__GNUC__) && __GNUC__ < 6 && !defined(__clang__)
   // A bug in some versions of the gcc 5.4.0 compiler
   // result in a linker error when = default is requested
   TransformBaseTemplate(){};