Skip to content

Commit

Permalink
STYLE: Rename ITK_DISALLOW_COPY_AND_ASSIGN to ITK_DISALLOW_COPY_AND_MOVE
Browse files Browse the repository at this point in the history
Clarifies that the macro does not just disallow copy and assign, but
also move operations. Note that in this context, the term 'move' refers
to both move-construct and move-assign.

With this commit, the old macro name will remain available, as long as
'ITK_FUTURE_LEGACY_REMOVE = OFF' (which is the default).
  • Loading branch information
hjmjohnson committed Jan 26, 2025
1 parent d9932e6 commit 4b4c5d9
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion include/itkWasmImageIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class WebAssemblyInterface_EXPORT WasmImageIO: public StreamingImageIOBase
size_t WriteCBOR(const void * buffer = nullptr, unsigned char ** cborBuffer = nullptr, bool allocateCBORBuffer = false);

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmImageIO);
ITK_DISALLOW_COPY_AND_MOVE(WasmImageIO);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion include/itkWasmImageIOFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class WebAssemblyInterface_EXPORT WasmImageIOFactory: public ObjectFactoryBase
~WasmImageIOFactory() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmImageIOFactory);
ITK_DISALLOW_COPY_AND_MOVE(WasmImageIOFactory);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion include/itkWasmMeshIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class WebAssemblyInterface_EXPORT WasmMeshIO: public MeshIOBase
cbor_item_t * m_CBORRoot{ nullptr };

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmMeshIO);
ITK_DISALLOW_COPY_AND_MOVE(WasmMeshIO);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion include/itkWasmMeshIOFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class WebAssemblyInterface_EXPORT WasmMeshIOFactory: public ObjectFactoryBase
~WasmMeshIOFactory() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmMeshIOFactory);
ITK_DISALLOW_COPY_AND_MOVE(WasmMeshIOFactory);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion include/itkWasmTransformIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class ITK_TEMPLATE_EXPORT WasmTransformIOTemplate : public TransformIOBaseTempla
cbor_item_t * m_CBORRoot{ nullptr };

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmTransformIOTemplate);
ITK_DISALLOW_COPY_AND_MOVE(WasmTransformIOTemplate);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion include/itkWasmTransformIOFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class WebAssemblyInterface_EXPORT WasmTransformIOFactory : public ObjectFactoryB
~WasmTransformIOFactory() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmTransformIOFactory);
ITK_DISALLOW_COPY_AND_MOVE(WasmTransformIOFactory);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion packages/dicom/gdcm/read-image-dicom-file-series.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ template <typename TOutputImage>
class ITK_TEMPLATE_EXPORT QuickDICOMImageSeriesReader : public ImageSeriesReader<TOutputImage>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(QuickDICOMImageSeriesReader);
ITK_DISALLOW_COPY_AND_MOVE(QuickDICOMImageSeriesReader);

/** Standard class type aliases. */
using Self = QuickDICOMImageSeriesReader;
Expand Down
2 changes: 1 addition & 1 deletion packages/image-io/itkWasmZstdImageIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class WebAssemblyInterface_EXPORT WasmZstdImageIO: public WasmImageIO
~WasmZstdImageIO() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmZstdImageIO);
ITK_DISALLOW_COPY_AND_MOVE(WasmZstdImageIO);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion packages/mesh-io/itkWasmZstdMeshIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class WebAssemblyInterface_EXPORT WasmZstdMeshIO: public WasmMeshIO
~WasmZstdMeshIO() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmZstdMeshIO);
ITK_DISALLOW_COPY_AND_MOVE(WasmZstdMeshIO);
};
} // end namespace itk

Expand Down
2 changes: 1 addition & 1 deletion packages/transform-io/itkWasmZstdTransformIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class ITK_TEMPLATE_EXPORT WasmZstdTransformIOTemplate: public WasmTransformIOTem
~WasmZstdTransformIOTemplate() override;

private:
ITK_DISALLOW_COPY_AND_ASSIGN(WasmZstdTransformIOTemplate);
ITK_DISALLOW_COPY_AND_MOVE(WasmZstdTransformIOTemplate);
};
} // end namespace itk

Expand Down

0 comments on commit 4b4c5d9

Please sign in to comment.