Commit 4e96214e authored by Cory Quammen's avatar Cory Quammen

Added VTK_OVERRIDE as needed

Fix many warnings about overriden member functions not being marked
'override'.
parent efaecc37
......@@ -13,13 +13,13 @@ public:
vtkTypeMacro(vtkCPTestPipeline, vtkCPPipeline);
static vtkCPTestPipeline* New();
virtual int RequestDataDescription(vtkCPDataDescription* dataDescription)
virtual int RequestDataDescription(vtkCPDataDescription* dataDescription) VTK_OVERRIDE
{
return this->ShouldOutput(dataDescription, false);
}
/// Execute the pipeline. Returns 1 for success and 0 for failure.
virtual int CoProcess(vtkCPDataDescription* dataDescription)
virtual int CoProcess(vtkCPDataDescription* dataDescription) VTK_OVERRIDE
{
this->OutputCounter++;
if (this->ShouldOutput(dataDescription, true) == 0)
......
......@@ -26,7 +26,7 @@ class VTK_EXPORT vtkCPImplementedTestDriver : public vtkCPTestDriver
public:
static vtkCPImplementedTestDriver* New();
vtkTypeMacro(vtkCPImplementedTestDriver, vtkCPTestDriver);
void PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); }
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE { this->Superclass::PrintSelf(os, indent); }
protected:
vtkCPImplementedTestDriver()
......
......@@ -37,14 +37,14 @@ class VTK_EXPORT vtkCustomUnstructuredGridBuilder : public vtkCPUnstructuredGrid
public:
static vtkCustomUnstructuredGridBuilder* New();
vtkTypeMacro(vtkCustomUnstructuredGridBuilder, vtkCPUnstructuredGridBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a grid. BuiltNewGrid is set to 0 if the grids
* that were returned were already built before.
* vtkCustomUnstructuredGridBuilder will also delete the grid.
*/
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid);
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) VTK_OVERRIDE;
/**
* Customized function to build UnstructuredGrid.
......
......@@ -34,7 +34,7 @@ class VTKPVCATALYST_EXPORT vtkCPCxxHelper : public vtkObject
public:
static vtkCPCxxHelper* New();
vtkTypeMacro(vtkCPCxxHelper, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
protected:
vtkCPCxxHelper();
......
......@@ -29,7 +29,7 @@ class VTKPVCATALYST_EXPORT vtkCPDataDescription : public vtkObject
public:
static vtkCPDataDescription* New();
vtkTypeMacro(vtkCPDataDescription, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/// Set the time step and current simulation time.
void SetTimeData(double time, vtkIdType timeStep);
......
......@@ -30,7 +30,7 @@ class VTKPVCATALYST_EXPORT vtkCPInputDataDescription : public vtkObject
public:
static vtkCPInputDataDescription* New();
vtkTypeMacro(vtkCPInputDataDescription, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
// Description:
// Reset the names of the fields that are needed.
......
......@@ -30,7 +30,7 @@ class VTKPVCATALYST_EXPORT vtkCPPipeline : public vtkObject
{
public:
vtkTypeMacro(vtkCPPipeline, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/// Configuration Step:
/// The coprocessor first determines if any coprocessing needs to be done
......
......@@ -59,7 +59,7 @@ class VTKPVCATALYST_EXPORT vtkCPProcessor : public vtkObject
public:
static vtkCPProcessor* New();
vtkTypeMacro(vtkCPProcessor, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/// Add in a pipeline that is externally configured. Returns 1 if
/// successful and 0 otherwise.
......
......@@ -33,13 +33,13 @@ class VTK_EXPORT vtkPVCustomTestDriver : public vtkCPTestDriver
public:
static vtkPVCustomTestDriver* New();
vtkTypeMacro(vtkPVCustomTestDriver, vtkCPTestDriver);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Run the test driver with the coprocessor.
* Returns 0 if there were no errors.
*/
virtual int Run();
virtual int Run() VTK_OVERRIDE;
/**
* Initialize the driver with the coprocessor. fileName is the
......
......@@ -31,7 +31,7 @@ class VTKPVPYTHONCATALYST_EXPORT vtkCPPythonScriptPipeline : public vtkCPPipelin
public:
static vtkCPPythonScriptPipeline* New();
vtkTypeMacro(vtkCPPythonScriptPipeline, vtkCPPipeline);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/// Initialize this pipeline from given the file name of a
/// python script. Returns 1 for success and 0 for failure.
......@@ -44,14 +44,14 @@ public:
/// it fills in the FieldNames array that the coprocessor requires
/// in order to fulfill all the coprocessing requests for this
/// TimeStep/Time combination.
virtual int RequestDataDescription(vtkCPDataDescription* dataDescription);
virtual int RequestDataDescription(vtkCPDataDescription* dataDescription) VTK_OVERRIDE;
/// Execute the pipeline. Returns 1 for success and 0 for failure.
virtual int CoProcess(vtkCPDataDescription* dataDescription);
virtual int CoProcess(vtkCPDataDescription* dataDescription) VTK_OVERRIDE;
/// Finalize the pipeline before deleting it. A default no-op implementation
/// is given. Returns 1 for success and 0 for failure.
virtual int Finalize();
virtual int Finalize() VTK_OVERRIDE;
protected:
vtkCPPythonScriptPipeline();
......
......@@ -33,7 +33,7 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPBaseFieldBuilder : public vtkObject
{
public:
vtkTypeMacro(vtkCPBaseFieldBuilder, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a grid. BuiltNewField is set to 0 if the grids
......
......@@ -31,7 +31,7 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPBaseGridBuilder : public vtkObject
{
public:
vtkTypeMacro(vtkCPBaseGridBuilder, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a grid. BuiltNewGrid is 0 if the grid is the same
......
......@@ -30,12 +30,12 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPCellFieldBuilder : public vtkCPFieldBu
public:
static vtkCPCellFieldBuilder* New();
vtkTypeMacro(vtkCPCellFieldBuilder, vtkCPFieldBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a field on Grid.
*/
virtual void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid);
virtual void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) VTK_OVERRIDE;
/**
* Return the highest order of discretization of the field.
......
......@@ -31,13 +31,13 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPConstantScalarFieldFunction
public:
static vtkCPConstantScalarFieldFunction* New();
vtkTypeMacro(vtkCPConstantScalarFieldFunction, vtkCPScalarFieldFunction);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Compute the field value at Point which is an array of length 3.
*/
virtual double ComputeComponenentAtPoint(
unsigned int component, double* point, unsigned long timeStep, double time);
unsigned int component, double* point, unsigned long timeStep, double time) VTK_OVERRIDE;
//@{
/**
......
......@@ -31,12 +31,12 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPFieldBuilder : public vtkCPBaseFieldBu
{
public:
vtkTypeMacro(vtkCPFieldBuilder, vtkCPBaseFieldBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a field on Grid.
*/
virtual void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) = 0;
virtual void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) VTK_OVERRIDE = 0;
/**
* Return the highest order of discretization of the field.
......
......@@ -32,14 +32,14 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPFileGridBuilder : public vtkCPGridBuil
{
public:
vtkTypeMacro(vtkCPFileGridBuilder, vtkCPGridBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a grid. BuiltNewGrid is set to 0 if the grids
* that were returned were already built before.
* vtkCPFileGridBuilder will also delete the grid.
*/
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid);
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) VTK_OVERRIDE;
//@{
/**
......
......@@ -32,14 +32,14 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPGridBuilder : public vtkCPBaseGridBuil
{
public:
vtkTypeMacro(vtkCPGridBuilder, vtkCPBaseGridBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a grid. BuiltNewGrid is set to 0 if the grids
* that were returned were already built before.
* vtkCPGridBuilder will also delete the grid.
*/
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) = 0;
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) VTK_OVERRIDE = 0;
//@{
/**
......
......@@ -32,13 +32,13 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPLinearScalarFieldFunction
public:
static vtkCPLinearScalarFieldFunction* New();
vtkTypeMacro(vtkCPLinearScalarFieldFunction, vtkCPScalarFieldFunction);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Compute the field value at Point.
*/
virtual double ComputeComponenentAtPoint(
unsigned int component, double point[3], unsigned long timeStep, double time);
unsigned int component, double point[3], unsigned long timeStep, double time) VTK_OVERRIDE;
//@{
/**
......
......@@ -35,13 +35,13 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPMultiBlockGridBuilder : public vtkCPBa
public:
static vtkCPMultiBlockGridBuilder* New();
vtkTypeMacro(vtkCPMultiBlockGridBuilder, vtkCPBaseGridBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a grid. BuiltNewGrid is 0 if the grid is the same
* as the last time step.
*/
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid);
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) VTK_OVERRIDE;
/**
* Get the Grid.
......
......@@ -30,12 +30,12 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPNodalFieldBuilder : public vtkCPFieldB
public:
static vtkCPNodalFieldBuilder* New();
vtkTypeMacro(vtkCPNodalFieldBuilder, vtkCPFieldBuilder);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Return a field on Grid.
*/
virtual void BuildField(unsigned long timeStep, double time, vtkDataSet* grid);
virtual void BuildField(unsigned long timeStep, double time, vtkDataSet* grid) VTK_OVERRIDE;
protected:
vtkCPNodalFieldBuilder();
......
......@@ -29,19 +29,19 @@ class VTKPVCATALYSTTESTDRIVER_EXPORT vtkCPScalarFieldFunction : public vtkCPTens
{
public:
vtkTypeMacro(vtkCPScalarFieldFunction, vtkCPTensorFieldFunction);
void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;