Merge pull request #32 from jhlegarreta/MoveDISALLOWCOPYANDASSIGNToPublicSection

COMP: Move ITK_DISALLOW_COPY_AND_ASSIGN calls to public section.

Author: thewtex

include/itkArrivalFunctionToPathFilter.h

@@ -42,6 +42,8 @@ template <class TFilter>
 class ArrivalFunctionToPathCommand : public itk::Command
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(ArrivalFunctionToPathCommand);
+
   /** Standard class type alias. */
   using Self = ArrivalFunctionToPathCommand;
   using Superclass = itk::Command;
@@ -82,8 +84,6 @@ class ArrivalFunctionToPathCommand : public itk::Command
   ~ArrivalFunctionToPathCommand() override{}
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ArrivalFunctionToPathCommand);
-
   typename FilterType::Pointer m_Filter;
 };
 
@@ -143,6 +143,8 @@ class ITK_EXPORT ArrivalFunctionToPathFilter :
     public ImageToPathFilter<TInputImage,TOutputPath>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(ArrivalFunctionToPathFilter);
+
   /** Standard class type alias. */
   using Self = ArrivalFunctionToPathFilter;
   using Superclass = ImageToPathFilter<TInputImage,TOutputPath>;
@@ -235,9 +237,6 @@ class ITK_EXPORT ArrivalFunctionToPathFilter :
   typename OptimizerType::MeasureType m_TerminationValue;
   std::vector<PointsContainerType> m_PointList;
   unsigned int m_CurrentOutput;
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(ArrivalFunctionToPathFilter);
 };
 
 } // end namespace itk

include/itkIterateNeighborhoodOptimizer.h

@@ -41,6 +41,8 @@ class MinimalPathExtraction_EXPORT IterateNeighborhoodOptimizer :
     public SingleValuedNonLinearOptimizer
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(IterateNeighborhoodOptimizer);
+
   /** Standard class type alias. */
   using Self = IterateNeighborhoodOptimizer;
   using Superclass = SingleValuedNonLinearOptimizer;
@@ -108,8 +110,6 @@ class MinimalPathExtraction_EXPORT IterateNeighborhoodOptimizer :
   void PrintSelf(std::ostream& os, Indent indent) const override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(IterateNeighborhoodOptimizer);
-
   bool                 m_Stop;
   bool                 m_Maximize;
   bool                 m_FullyConnected;

include/itkPhysicalCentralDifferenceImageFunction.h

@@ -47,6 +47,8 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
                         TCoordRep >
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(PhysicalCentralDifferenceImageFunction);
+
   /** Dimension underlying input image. */
   static constexpr unsigned int ImageDimension = TInputImage::ImageDimension;
 
@@ -136,8 +138,6 @@ class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
   void PrintSelf(std::ostream& os, Indent indent) const override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(PhysicalCentralDifferenceImageFunction);
-
   typename InterpolateImageFunctionType::Pointer m_Interpolator;
 
 };

include/itkSingleImageCostFunction.h

@@ -53,6 +53,8 @@ class ITK_EXPORT SingleImageCostFunction :
     public SingleValuedCostFunction
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(SingleImageCostFunction);
+
   /** Standard class type alias. */
   using Self = SingleImageCostFunction;
   using Superclass = SingleValuedCostFunction;
@@ -142,8 +144,6 @@ class ITK_EXPORT SingleImageCostFunction :
   void PrintSelf(std::ostream& os, Indent indent) const override;
 
 private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(SingleImageCostFunction);
-
   ImageConstPointer                           m_Image;
   typename InterpolatorType::Pointer          m_Interpolator;
   typename GradientImageFunctionType::Pointer m_GradientImageFunction;

include/itkSpeedFunctionPathInformation.h

@@ -53,6 +53,8 @@ class SpeedFunctionPathInformation :
   public LightObject
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(SpeedFunctionPathInformation);
+
   /** Standard class type alias. */
   using Self = SpeedFunctionPathInformation;
   using Superclass = LightObject;
@@ -132,8 +134,6 @@ class SpeedFunctionPathInformation :
     V[0]=P;
     return(V);
   }
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(SpeedFunctionPathInformation);
 };
 
 

include/itkSpeedFunctionToPathFilter.h

@@ -67,6 +67,8 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
     public ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
 {
 public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(SpeedFunctionToPathFilter);
+
   /** Standard class type alias. */
   using Self = SpeedFunctionToPathFilter;
   using Superclass = ArrivalFunctionToPathFilter<TInputImage,TOutputPath>;
@@ -170,10 +172,6 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
 
   std::vector< typename PathInformationType::Pointer > m_Information;
   InputImagePointer                                    m_CurrentArrivalFunction;
-
-private:
-  ITK_DISALLOW_COPY_AND_ASSIGN(SpeedFunctionToPathFilter);
-
 };
 
 } // end namespace itk