Commit 5484c6ba authored by Cory Quammen's avatar Cory Quammen

Merge branch 'upstream-visit' into replace-override

* upstream-visit:
  visit 2018-12-06 (3c1734f3)
parents 0eb04109 9f6759bf
......@@ -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
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