Commit c7d8fefa authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot

Merge topic 'replace-override'

1e1da421 Change VTK_OVERRIDE to override
5484c6ba Merge branch 'upstream-visit' into replace-override
9f6759bf visit 2018-12-06 (3c1734f3)
0eb04109 Update source branch to for/paraview-20181206-trunk-r30784
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !55
parents 1d2e1bfe 1e1da421
......@@ -42,7 +42,7 @@ class VTKIOVISITBRIDGE_EXPORT @PLUGIN_NAME@ : public vtkAvt@ARG_VISIT_READER_TYP
public:
static @PLUGIN_NAME@ *New();
vtkTypeMacro(@PLUGIN_NAME@,vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm );
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetStringMacro(FileName);
vtkGetStringMacro(FileName);
#ifdef VISIT_READER_USES_INTERFACE
......@@ -53,8 +53,8 @@ protected:
@PLUGIN_NAME@();
~@PLUGIN_NAME@();
bool InitializeAVTReader( const int& timestep ) VTK_OVERRIDE;
bool ActivateTimestep( const int& timestep ) VTK_OVERRIDE;
bool InitializeAVTReader( const int& timestep ) override;
bool ActivateTimestep( const int& timestep ) override;
char *FileName;
private:
......
......@@ -41,7 +41,7 @@ class VTKIOVISITBRIDGE_EXPORT @PLUGIN_NAME@ : public vtkAvt@ARG_VISIT_READER_TYP
public:
static @PLUGIN_NAME@ *New();
vtkTypeMacro(@PLUGIN_NAME@,vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm );
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetStringMacro(FileName);
vtkGetStringMacro(FileName);
#ifdef VISIT_READER_USES_INTERFACE
......@@ -52,7 +52,7 @@ protected:
@PLUGIN_NAME@();
~@PLUGIN_NAME@();
bool InitializeAVTReader( const int& timestep ) VTK_OVERRIDE;
bool InitializeAVTReader( const int& timestep ) override;
char *FileName;
private:
......
......@@ -22,3 +22,7 @@ within a single process.
ParaView.
* Add the `ValidNETCDFFile.h` header.
* Add CMake lists for databases imported into ParaView.
* Comment out unused functions in `RC_cpp_lib`.
* Updating avtANSYSFileFormat reader to read in 10-noded tetras.
* Read PFLOTRAN files with big-endian floating-point arrays.
* Port MFIXCDF from netcdfcpp to netcdf
......@@ -74,7 +74,7 @@ class VTKIOVISITBRIDGE_EXPORT vtkAvtFileFormatAlgorithm : public vtkCompositeDat
public:
static vtkAvtFileFormatAlgorithm *New();
vtkTypeMacro(vtkAvtFileFormatAlgorithm,vtkCompositeDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Get the number of point or cell arrays available in the input.
......@@ -123,30 +123,30 @@ protected:
//level piece loading
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
// Description:
// This is called by the superclass.
// This is the method you should override.
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
// Description:
// This is called by the superclass.
// This is the method you should override.
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
// Description:
// This is called by the superclass.
// This is the method you should override.
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*) VTK_OVERRIDE;
vtkInformationVector*) override;
// see algorithm for more info
int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
int FillOutputPortInformation(int port, vtkInformation* info) override;
//methods that setup selection arrays that the client will interact with
void SetupDataArraySelections();
......
......@@ -47,7 +47,7 @@ class VTKIOVISITBRIDGE_EXPORT vtkAvtMTMDFileFormatAlgorithm : public vtkAvtSTMDF
public:
static vtkAvtMTMDFileFormatAlgorithm *New();
vtkTypeMacro(vtkAvtMTMDFileFormatAlgorithm,vtkAvtSTMDFileFormatAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkAvtMTMDFileFormatAlgorithm();
......@@ -58,7 +58,7 @@ protected:
// This is the method you should override.
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
private:
vtkAvtMTMDFileFormatAlgorithm(const vtkAvtMTMDFileFormatAlgorithm&);
......
......@@ -46,7 +46,7 @@ class VTKIOVISITBRIDGE_EXPORT vtkAvtMTSDFileFormatAlgorithm : public vtkAvtSTSDF
public:
static vtkAvtMTSDFileFormatAlgorithm *New();
vtkTypeMacro(vtkAvtMTSDFileFormatAlgorithm,vtkAvtSTSDFileFormatAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkAvtMTSDFileFormatAlgorithm();
......@@ -57,7 +57,7 @@ protected:
// This is the method you should override.
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
private:
vtkAvtMTSDFileFormatAlgorithm(const vtkAvtMTSDFileFormatAlgorithm&);
......
......@@ -60,7 +60,7 @@ class VTKIOVISITBRIDGE_EXPORT vtkAvtSTMDFileFormatAlgorithm : public vtkAvtFileF
public:
static vtkAvtSTMDFileFormatAlgorithm *New();
vtkTypeMacro(vtkAvtSTMDFileFormatAlgorithm,vtkAvtFileFormatAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkAvtSTMDFileFormatAlgorithm();
......@@ -68,14 +68,14 @@ protected:
//needed since we have to change the type we output
int RequestDataObject(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector *) override;
// Description:
// This is called by the superclass.
// This is the method you should override.
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
//BTX
int FillAMR( vtkOverlappingAMR *amr,
......
......@@ -47,7 +47,7 @@ class VTKIOVISITBRIDGE_EXPORT vtkAvtSTSDFileFormatAlgorithm : public vtkAvtFileF
public:
static vtkAvtSTSDFileFormatAlgorithm *New();
vtkTypeMacro(vtkAvtSTSDFileFormatAlgorithm,vtkAvtFileFormatAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkAvtSTSDFileFormatAlgorithm();
......@@ -55,14 +55,14 @@ protected:
//needed since we have to change the type we output
virtual int RequestDataObject(vtkInformation *, vtkInformationVector **,
vtkInformationVector *) VTK_OVERRIDE;
vtkInformationVector *) override;
// Description:
// This is called by the superclass.
// This is the method you should override.
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector) VTK_OVERRIDE;
vtkInformationVector* outputVector) override;
virtual void FillMultiBlock(vtkMultiBlockDataSet *output, const int &timestep);
......
......@@ -8,7 +8,7 @@ readonly name="visit"
readonly ownership="VisIt Upstream <kwrobot@kitware.com>"
readonly subtree="Library/VisItLib"
readonly repo="https://gitlab.kitware.com/third-party/visit.git"
readonly tag="for/paraview"
readonly tag="for/paraview-20181206-trunk-r30784"
readonly paths="
COPYRIGHT
......
......@@ -8,7 +8,7 @@ readonly name="visit-databases"
readonly ownership="VisIt Upstream <kwrobot@kitware.com>"
readonly subtree="databases/readers"
readonly repo="https://gitlab.kitware.com/third-party/visit.git"
readonly tag="for/paraview-20181019-trunk-r30784"
readonly tag="for/paraview-20181206-trunk-r30784"
readonly paths="
COPYRIGHT
......
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