COMP: use ITK's module mechanisme for EXPORT macros

RTKConsortium · Jun 3, 2022 · 097151f · 097151f
1 parent 2c5b730
commit 097151f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 47 deletions.
diff --git a/include/itkCudaContextManager.h b/include/itkCudaContextManager.h
@@ -20,7 +20,7 @@
 
 #include "itkCudaUtil.h"
 #include <itkLightObject.h>
-#include "itkCudaWin32Header.h"
+#include "CudaCommonExport.h"
 
 //
 // Singleton class for CudaContextManager
@@ -34,7 +34,7 @@
  */
 namespace itk
 {
-class ITKCudaCommon_EXPORT CudaContextManager : public LightObject
+class CudaCommon_EXPORT CudaContextManager : public LightObject
 {
 public:
   static CudaContextManager *

diff --git a/include/itkCudaDataManager.h b/include/itkCudaDataManager.h
@@ -23,7 +23,7 @@
 #include "itkObjectFactory.h"
 #include "itkCudaUtil.h"
 #include "itkCudaContextManager.h"
-#include "itkCudaWin32Header.h"
+#include "CudaCommonExport.h"
 
 #include <mutex>
 #include <memory>
@@ -32,7 +32,7 @@
 
 namespace itk
 {
-class ITKCudaCommon_EXPORT GPUMemPointer : public Object
+class CudaCommon_EXPORT GPUMemPointer : public Object
 {
 public:
   using Self = GPUMemPointer;
@@ -121,7 +121,7 @@ class ITKCudaCommon_EXPORT GPUMemPointer : public Object
  *
  * \ingroup ITKCudaCommon
  */
-class ITKCudaCommon_EXPORT CudaDataManager : public Object
+class CudaCommon_EXPORT CudaDataManager : public Object
 {
 public:
   using Self = CudaDataManager;

diff --git a/include/itkCudaImage.h b/include/itkCudaImage.h
@@ -20,7 +20,7 @@
 
 #include "itkImage.h"
 #include "itkCudaImageDataManager.h"
-#include "itkCudaWin32Header.h"
+#include "CudaCommonExport.h"
 #include "itkVersion.h"
 #include "itkObjectFactoryBase.h"
 
@@ -221,7 +221,7 @@ class ITK_TEMPLATE_EXPORT CudaImage : public Image<TPixel, VImageDimension>
   typename CudaImageDataManager<CudaImage>::Pointer m_DataManager;
 };
 
-class ITKCudaCommon_EXPORT CudaImageFactory : public itk::ObjectFactoryBase
+class CudaCommon_EXPORT CudaImageFactory : public itk::ObjectFactoryBase
 {
 public:
   using Self = CudaImageFactory;

diff --git a/include/itkCudaMemoryProbe.h b/include/itkCudaMemoryProbe.h
@@ -20,7 +20,7 @@
 
 #include "itkResourceProbe.h"
 #include "itkIntTypes.h"
-#include "itkCudaWin32Header.h"
+#include "CudaCommonExport.h"
 
 namespace itk
 {
@@ -35,7 +35,7 @@ namespace itk
  *
  * \ingroup ITKCudaCommon
  */
-class ITKCudaCommon_EXPORT CudaMemoryProbe : public ResourceProbe<OffsetValueType, double>
+class CudaCommon_EXPORT CudaMemoryProbe : public ResourceProbe<OffsetValueType, double>
 {
 public:
   CudaMemoryProbe();

diff --git a/include/itkCudaSquareImageFilter.h b/include/itkCudaSquareImageFilter.h
@@ -47,7 +47,7 @@ class ITK_TEMPLATE_EXPORT CudaSquareImageFilter : public CudaImageToImageFilter<
   /** Run-time type information (and related methods). */
   itkTypeMacro(CudaSquareImageFilter, CudaImageToImageFilter);
 
-  ITK_DISALLOW_COPY_AND_ASSIGN(CudaSquareImageFilter);
+  ITK_DISALLOW_COPY_AND_MOVE(CudaSquareImageFilter);
 
   /** ImageDimension constants */
   static constexpr unsigned int ImageDimension = TImage::ImageDimension;

diff --git a/include/itkCudaUtil.h b/include/itkCudaUtil.h
@@ -33,7 +33,7 @@
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <cuda_runtime_api.h>
-#include "itkCudaWin32Header.h"
+#include "CudaCommonExport.h"
 
 namespace itk
 {
@@ -68,10 +68,10 @@ int
 CudaSelectPlatform(const char * name);
 
 /** Check Cuda error */
-void ITKCudaCommon_EXPORT
+void CudaCommon_EXPORT
      CudaCheckError(cudaError_t error, const char * filename = "", int lineno = 0, const char * location = "");
 
-void ITKCudaCommon_EXPORT
+void CudaCommon_EXPORT
      CudaCheckError(CUresult error, const char * filename = "", int lineno = 0, const char * location = "");
 
 /** Check if Cuda-enabled Cuda is present. */

diff --git a/include/itkCudaWin32Header.h b/include/itkCudaWin32Header.h