Commit 18a963b0 authored by Sean McBride's avatar Sean McBride

Added missing dtor overrides found by new clang warning

Found with -Winconsistent-missing-destructor-override
parent 4305917c
......@@ -52,7 +52,7 @@ public:
protected:
vtkInteractiveArea();
~vtkInteractiveArea();
~vtkInteractiveArea() override;
///@{
/**
......
......@@ -48,7 +48,7 @@ public:
protected:
vtkTestNewVar();
~vtkTestNewVar();
~vtkTestNewVar() override;
vtkNew<vtkPoints2D> Points;
......
......@@ -39,7 +39,7 @@ public:
protected:
vtkDataArrayTemplate() {}
~vtkDataArrayTemplate() {}
~vtkDataArrayTemplate() override {}
private:
vtkDataArrayTemplate(const vtkDataArrayTemplate&) VTK_DELETE_FUNCTION;
......
......@@ -73,7 +73,7 @@ public:
protected:
vtkTestDataArray() { this->Array = ArrayType::New(); }
~vtkTestDataArray() { this->Array->Delete(); }
~vtkTestDataArray() override { this->Array->Delete(); }
bool AllocateTuples(vtkIdType numTuples)
{ return this->Array->Allocate(numTuples) != 0; }
......
......@@ -45,7 +45,7 @@ public:
protected:
vtkType@VTK_TYPE_NAME@Array();
~vtkType@VTK_TYPE_NAME@Array();
~vtkType@VTK_TYPE_NAME@Array() override;
private:
vtkType@VTK_TYPE_NAME@Array(const vtkType@VTK_TYPE_NAME@Array&) VTK_DELETE_FUNCTION;
......
......@@ -34,7 +34,7 @@ public:
vtkTypeMacro(vtkWeakReference, vtkObject);
static vtkWeakReference *New();
vtkWeakReference();
~vtkWeakReference();
~vtkWeakReference() override;
/**
* Set the vtkObject to maintain a weak reference to.
......
......@@ -219,7 +219,7 @@ protected: \
this->SetImplementation(i); \
i->Delete(); \
} \
~_className() {} \
~_className() override {} \
private: \
_className(const _className&); \
void operator=(const _className&); \
......@@ -240,7 +240,7 @@ protected: \
this->SetImplementation(i); \
i->Delete(); \
} \
~_className() {} \
~_className() override {} \
private: \
_className(const _className&); \
void operator=(const _className&); \
......@@ -257,7 +257,7 @@ public: \
static _className* New(); \
protected: \
_className() {} \
~_className() {} \
~_className() override {} \
private: \
_className(const _className&); \
void operator=(const _className&); \
......@@ -272,7 +272,7 @@ public: \
static _className* New(); \
protected: \
_className() {} \
~_className() {} \
~_className() override {} \
private: \
_className(const _className&); \
void operator=(const _className&); \
......
......@@ -91,7 +91,7 @@ struct vtkStructuredHierarchy : public vtkSphereTreeHierarchy
this->H->SetNumberOfTuples(size);
}
virtual ~vtkStructuredHierarchy()
~vtkStructuredHierarchy() override
{
this->H->Delete();
this->H = nullptr;
......@@ -135,7 +135,7 @@ struct vtkUnstructuredHierarchy : public vtkSphereTreeHierarchy
this->CellLoc = new vtkIdType [numCells];
this->CellMap = new vtkIdType [numCells];
}
virtual ~vtkUnstructuredHierarchy()
~vtkUnstructuredHierarchy() override
{
delete [] this->NumSpheres;
this->NumSpheres = nullptr;
......
......@@ -25,7 +25,7 @@ public:
protected:
vtkLocalExample();
~vtkLocalExample();
~vtkLocalExample() override;
private:
vtkLocalExample(const vtkLocalExample&) VTK_DELETE_FUNCTION;
......
......@@ -33,7 +33,7 @@ public:
protected:
vtkBar() {}
~vtkBar() {}
~vtkBar() override {}
private:
vtkBar(const vtkBar&) VTK_DELETE_FUNCTION;
void operator=(const vtkBar&) VTK_DELETE_FUNCTION;
......
......@@ -74,7 +74,7 @@ public:
protected:
vtkImageFoo();
~vtkImageFoo();
~vtkImageFoo() override;
float Foo;
int OutputScalarType;
......
......@@ -33,7 +33,7 @@ public:
protected:
vtkBar2() {}
~vtkBar2() {}
~vtkBar2() override {}
private:
vtkBar2(const vtkBar2&) VTK_DELETE_FUNCTION;
void operator=(const vtkBar2&) VTK_DELETE_FUNCTION;
......
......@@ -41,7 +41,7 @@ public:
protected:
vtkAppendArcLength();
~vtkAppendArcLength();
~vtkAppendArcLength() override;
//@{
/**
......
......@@ -1144,7 +1144,7 @@ struct RectilinearFunctor : public CuttingFunctor
this->PointsType = this->InPoints->GetDataType();
}
~RectilinearFunctor() { this->InPoints->Delete(); }
~RectilinearFunctor() override { this->InPoints->Delete(); }
void Initialize() { CuttingFunctor::Initialize(); }
......
......@@ -127,7 +127,7 @@ public:
protected:
vtkContourLoopExtraction();
~vtkContourLoopExtraction();
~vtkContourLoopExtraction() override;
int LoopClosure;
bool ScalarThresholding;
......
......@@ -70,7 +70,7 @@ public:
protected:
vtkCookieCutter();
~vtkCookieCutter();
~vtkCookieCutter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
......
......@@ -96,7 +96,7 @@ public:
protected:
vtkMaskPointsFilter();
~vtkMaskPointsFilter();
~vtkMaskPointsFilter() override;
unsigned char EmptyValue; // what value indicates a voxel is empty
......
......@@ -93,7 +93,7 @@ public:
protected:
vtkPointOccupancyFilter();
~vtkPointOccupancyFilter();
~vtkPointOccupancyFilter() override;
int SampleDimensions[3]; // dimensions of volume over which to compute occupancy
double ModelBounds[6]; // bounding box defining image
......
......@@ -206,7 +206,7 @@ public:
protected:
vtkUnsignedDistance();
~vtkUnsignedDistance();
~vtkUnsignedDistance() override;
int Dimensions[3];
double Bounds[6];
......
......@@ -77,7 +77,7 @@ public:
protected:
vtkPythonAlgorithm();
~vtkPythonAlgorithm();
~vtkPythonAlgorithm() override;
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
......
......@@ -96,7 +96,7 @@ public:
protected:
vtkCellSizeFilter();
~vtkCellSizeFilter();
~vtkCellSizeFilter() override;
virtual int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
......
......@@ -217,7 +217,7 @@ public:
protected:
vtkRenderTimerLog();
~vtkRenderTimerLog();
~vtkRenderTimerLog() override;
bool LoggingEnabled;
unsigned int FrameLimit;
......
......@@ -92,7 +92,7 @@ protected:
size_t MinTimerPoolSize;
vtkOpenGLRenderTimerLog();
~vtkOpenGLRenderTimerLog();
~vtkOpenGLRenderTimerLog() override;
bool DoLogging();
......
......@@ -58,7 +58,7 @@ public:
protected:
vtkOpenGLVertexBufferObjectCache();
~vtkOpenGLVertexBufferObjectCache();
~vtkOpenGLVertexBufferObjectCache() override;
VBOMap MappedVBOs;
......
......@@ -114,7 +114,7 @@ public:
protected:
vtkOpenGLVertexBufferObjectGroup();
~vtkOpenGLVertexBufferObjectGroup();
~vtkOpenGLVertexBufferObjectGroup() override;
std::map<std::string, vtkOpenGLVertexBufferObject*> UsedVBOs;
std::map<std::string, std::vector<vtkDataArray*> > UsedDataArrays;
......
......@@ -134,7 +134,7 @@ public:
protected:
vtkMultiBlockVolumeMapper();
~vtkMultiBlockVolumeMapper();
~vtkMultiBlockVolumeMapper() override;
/**
* Specify the type of data this mapper can handle. This mapper requires
......
......@@ -92,7 +92,7 @@ public:
protected:
vtkDataEncoder();
~vtkDataEncoder();
~vtkDataEncoder() override;
private:
vtkDataEncoder(const vtkDataEncoder&) VTK_DELETE_FUNCTION;
......
......@@ -62,7 +62,7 @@ public:
protected:
vtkObjectIdMap();
~vtkObjectIdMap();
~vtkObjectIdMap() override;
private:
vtkObjectIdMap(const vtkObjectIdMap&) VTK_DELETE_FUNCTION;
......
......@@ -127,7 +127,7 @@ public:
protected:
vtkWebApplication();
~vtkWebApplication();
~vtkWebApplication() override;
int ImageEncoding;
int ImageCompression;
......
......@@ -88,7 +88,7 @@ public:
protected:
vtkWebInteractionEvent();
~vtkWebInteractionEvent();
~vtkWebInteractionEvent() override;
unsigned int Buttons;
unsigned int Modifiers;
......
......@@ -53,7 +53,7 @@ public:
protected:
vtkWebUtilities();
~vtkWebUtilities();
~vtkWebUtilities() override;
private:
vtkWebUtilities(const vtkWebUtilities&) VTK_DELETE_FUNCTION;
......
......@@ -32,7 +32,7 @@ public:
protected:
vtkPVWebGLExporter();
~vtkPVWebGLExporter();
~vtkPVWebGLExporter() override;
void WriteData() VTK_OVERRIDE;
......
......@@ -52,7 +52,7 @@ public:
protected:
vtkWebGLDataSet();
~vtkWebGLDataSet();
~vtkWebGLDataSet() override;
int NumberOfVertices;
int NumberOfPoints;
......
......@@ -71,7 +71,7 @@ public:
static void ComputeMD5(const unsigned char* content, int size, std::string &hash);
protected:
vtkWebGLExporter();
~vtkWebGLExporter();
~vtkWebGLExporter() override;
void parseRenderer(vtkRenderer* render, const char* viewId, bool onlyWidget, void* mapTime);
void generateRendererData(vtkRendererCollection* renderers, const char* viewId);
......
......@@ -79,7 +79,7 @@ public:
protected:
vtkWebGLObject();
~vtkWebGLObject();
~vtkWebGLObject() override;
float Matrix[16];
size_t rendererId;
......
......@@ -61,7 +61,7 @@ public:
protected:
vtkWebGLPolyData();
~vtkWebGLPolyData();
~vtkWebGLPolyData() override;
private:
vtkWebGLPolyData(const vtkWebGLPolyData&) VTK_DELETE_FUNCTION;
......
......@@ -44,7 +44,7 @@ public:
protected:
vtkWebGLWidget();
~vtkWebGLWidget();
~vtkWebGLWidget() override;
unsigned char* binaryData;
int binarySize;
......
......@@ -36,7 +36,7 @@ public:
PyThreadState *ThreadState;
protected:
vtkPythonCommand();
~vtkPythonCommand();
~vtkPythonCommand() override;
};
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment