Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Remove all uses of VTKM_OVERRIDE at instead just use override.

Browse Source 
Since VTK-m now requires C++11 it is safe to remove our custom defines
and move to using the keyword directly.
This commit is contained in:
Robert Maynard 2017-11-02 08:36:05 -04:00
parent 49297252c0
commit e49f27a3ac
19 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vtkm/cont/CellSetExplicit.h
View File

@ -106,11 +106,11 @@ public:
virtual ~CellSetExplicit();
vtkm::Id GetNumberOfCells() const VTKM_OVERRIDE;
vtkm::Id GetNumberOfPoints() const VTKM_OVERRIDE;
vtkm::Id GetNumberOfFaces() const VTKM_OVERRIDE;
vtkm::Id GetNumberOfEdges() const VTKM_OVERRIDE;
void PrintSummary(std::ostream& out) const VTKM_OVERRIDE;
vtkm::Id GetNumberOfCells() const override;
vtkm::Id GetNumberOfPoints() const override;
vtkm::Id GetNumberOfFaces() const override;
vtkm::Id GetNumberOfEdges() const override;
void PrintSummary(std::ostream& out) const override;
VTKM_CONT vtkm::Id GetSchedulingRange(vtkm::TopologyElementTagCell) const;
VTKM_CONT vtkm::Id GetSchedulingRange(vtkm::TopologyElementTagPoint) const;

4
vtkm/cont/Error.h
View File

@ -27,7 +27,7 @@
#include <exception>
#include <string>
#include <vtkm/internal/ExportMacros.h> // For VTKM_OVERRIDE
#include <vtkm/internal/ExportMacros.h> // For VTKM_NOEXCEPT
namespace vtkm
{
@ -55,7 +55,7 @@ public:
#endif
// For std::exception compatibility:
const char* what() const VTKM_NOEXCEPT VTKM_OVERRIDE { return this->Message.c_str(); }
const char* what() const VTKM_NOEXCEPT override { return this->Message.c_str(); }
protected:
Error() {}

2
vtkm/rendering/AxisAnnotation2D.h
View File

@ -127,7 +127,7 @@ public:
void Render(const vtkm::rendering::Camera& camera,
const vtkm::rendering::WorldAnnotator& worldAnnotator,
vtkm::rendering::Canvas& canvas) VTKM_OVERRIDE;
vtkm::rendering::Canvas& canvas) override;
};
}
} //namespace vtkm::rendering

2
vtkm/rendering/AxisAnnotation3D.h
View File

@ -123,7 +123,7 @@ public:
virtual void Render(const vtkm::rendering::Camera& camera,
const vtkm::rendering::WorldAnnotator& worldAnnotator,
vtkm::rendering::Canvas& canvas) VTKM_OVERRIDE;
vtkm::rendering::Canvas& canvas) override;
};
}
} //namespace vtkm::rendering

6
vtkm/rendering/CanvasEGL.h
View File

@ -44,11 +44,11 @@ public:
~CanvasEGL();
virtual void Initialize() VTKM_OVERRIDE;
virtual void Initialize() override;
virtual void Activate() VTKM_OVERRIDE;
virtual void Activate() override;
vtkm::rendering::Canvas* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Canvas* NewCopy() const override;
private:
std::shared_ptr<detail::CanvasEGLInternals> Internals;

30
vtkm/rendering/CanvasGL.h
View File

@ -38,43 +38,43 @@ public:
~CanvasGL();
void Initialize() VTKM_OVERRIDE;
void Initialize() override;
void Activate() VTKM_OVERRIDE;
void Activate() override;
void Clear() VTKM_OVERRIDE;
void Clear() override;
void Finish() VTKM_OVERRIDE;
void Finish() override;
vtkm::rendering::Canvas* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Canvas* NewCopy() const override;
void SetViewToWorldSpace(const vtkm::rendering::Camera& camera, bool clip) VTKM_OVERRIDE;
void SetViewToWorldSpace(const vtkm::rendering::Camera& camera, bool clip) override;
void SetViewToScreenSpace(const vtkm::rendering::Camera& camera, bool clip) VTKM_OVERRIDE;
void SetViewToScreenSpace(const vtkm::rendering::Camera& camera, bool clip) override;
void SetViewportClipping(const vtkm::rendering::Camera& camera, bool clip) VTKM_OVERRIDE;
void SetViewportClipping(const vtkm::rendering::Camera& camera, bool clip) override;
void RefreshColorBuffer() const VTKM_OVERRIDE;
void RefreshColorBuffer() const override;
virtual void RefreshDepthBuffer() const VTKM_OVERRIDE;
virtual void RefreshDepthBuffer() const override;
vtkm::rendering::WorldAnnotator* CreateWorldAnnotator() const VTKM_OVERRIDE;
vtkm::rendering::WorldAnnotator* CreateWorldAnnotator() const override;
protected:
void AddLine(const vtkm::Vec<vtkm::Float64, 2>& point0,
const vtkm::Vec<vtkm::Float64, 2>& point1,
vtkm::Float32 linewidth,
const vtkm::rendering::Color& color) const VTKM_OVERRIDE;
const vtkm::rendering::Color& color) const override;
void AddColorBar(const vtkm::Bounds& bounds,
const vtkm::rendering::ColorTable& colorTable,
bool horizontal) const VTKM_OVERRIDE;
bool horizontal) const override;
void AddColorSwatch(const vtkm::Vec<vtkm::Float64, 2>& point0,
const vtkm::Vec<vtkm::Float64, 2>& point1,
const vtkm::Vec<vtkm::Float64, 2>& point2,
const vtkm::Vec<vtkm::Float64, 2>& point3,
const vtkm::rendering::Color& color) const VTKM_OVERRIDE;
const vtkm::rendering::Color& color) const override;
void AddText(const vtkm::Vec<vtkm::Float32, 2>& position,
vtkm::Float32 scale,
@ -82,7 +82,7 @@ protected:
vtkm::Float32 windowAspect,
const vtkm::Vec<vtkm::Float32, 2>& anchor,
const vtkm::rendering::Color& color,
const std::string& text) const VTKM_OVERRIDE;
const std::string& text) const override;
private:
vtkm::rendering::BitmapFont Font;

10
vtkm/rendering/CanvasOSMesa.h
View File

@ -45,15 +45,15 @@ public:
~CanvasOSMesa();
virtual void Initialize() VTKM_OVERRIDE;
virtual void Initialize() override;
virtual void RefreshColorBuffer() const VTKM_OVERRIDE;
virtual void RefreshColorBuffer() const override;
virtual void Activate() VTKM_OVERRIDE;
virtual void Activate() override;
virtual void Finish() VTKM_OVERRIDE;
virtual void Finish() override;
vtkm::rendering::Canvas* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Canvas* NewCopy() const override;
private:
std::shared_ptr<detail::CanvasOSMesaInternals> Internals;

2
vtkm/rendering/CanvasRayTracer.h
View File

@ -37,7 +37,7 @@ public:
~CanvasRayTracer();
vtkm::rendering::Canvas* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Canvas* NewCopy() const override;
void WriteToCanvas(const vtkm::rendering::raytracing::Ray<vtkm::Float32>& rays,
const vtkm::cont::ArrayHandle<vtkm::Float32>& colors,

12
vtkm/rendering/MapperConnectivity.h
View File

@ -37,20 +37,20 @@ public:
~MapperConnectivity();
void SetSampleDistance(const vtkm::Float32&);
void SetCanvas(vtkm::rendering::Canvas* canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
void SetCanvas(vtkm::rendering::Canvas* canvas) override;
virtual vtkm::rendering::Canvas* GetCanvas() const override;
virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
const vtkm::cont::CoordinateSystem& coords,
const vtkm::cont::Field& scalarField,
const vtkm::rendering::ColorTable&, //colorTable
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) VTKM_OVERRIDE;
const vtkm::Range& scalarRange) override;
virtual void StartScene() VTKM_OVERRIDE;
virtual void EndScene() VTKM_OVERRIDE;
virtual void StartScene() override;
virtual void EndScene() override;
vtkm::rendering::Mapper* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Mapper* NewCopy() const override;
void CreateDefaultView();
protected:

12
vtkm/rendering/MapperGL.h
View File

@ -45,14 +45,14 @@ public:
const vtkm::cont::Field& scalarField,
const vtkm::rendering::ColorTable& colorTable,
const vtkm::rendering::Camera&,
const vtkm::Range& scalarRange) VTKM_OVERRIDE;
const vtkm::Range& scalarRange) override;
void StartScene() VTKM_OVERRIDE;
void EndScene() VTKM_OVERRIDE;
void SetCanvas(vtkm::rendering::Canvas* canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
void StartScene() override;
void EndScene() override;
void SetCanvas(vtkm::rendering::Canvas* canvas) override;
virtual vtkm::rendering::Canvas* GetCanvas() const override;
vtkm::rendering::Mapper* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Mapper* NewCopy() const override;
vtkm::rendering::CanvasGL* Canvas;
GLuint shader_programme;

12
vtkm/rendering/MapperRayTracer.h
View File

@ -38,20 +38,20 @@ public:
~MapperRayTracer();
void SetCanvas(vtkm::rendering::Canvas* canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
void SetCanvas(vtkm::rendering::Canvas* canvas) override;
virtual vtkm::rendering::Canvas* GetCanvas() const override;
void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
const vtkm::cont::CoordinateSystem& coords,
const vtkm::cont::Field& scalarField,
const vtkm::rendering::ColorTable& colorTable,
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) VTKM_OVERRIDE;
const vtkm::Range& scalarRange) override;
virtual void StartScene() VTKM_OVERRIDE;
virtual void EndScene() VTKM_OVERRIDE;
virtual void StartScene() override;
virtual void EndScene() override;
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Mapper* NewCopy() const override;
private:
struct InternalsType;

12
vtkm/rendering/MapperVolume.h
View File

@ -36,20 +36,20 @@ public:
~MapperVolume();
void SetCanvas(vtkm::rendering::Canvas* canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
void SetCanvas(vtkm::rendering::Canvas* canvas) override;
virtual vtkm::rendering::Canvas* GetCanvas() const override;
virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
const vtkm::cont::CoordinateSystem& coords,
const vtkm::cont::Field& scalarField,
const vtkm::rendering::ColorTable&, //colorTable
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) VTKM_OVERRIDE;
const vtkm::Range& scalarRange) override;
virtual void StartScene() VTKM_OVERRIDE;
virtual void EndScene() VTKM_OVERRIDE;
virtual void StartScene() override;
virtual void EndScene() override;
vtkm::rendering::Mapper* NewCopy() const VTKM_OVERRIDE;
vtkm::rendering::Mapper* NewCopy() const override;
void SetSampleDistance(const vtkm::Float32 distance);
void SetCompositeBackground(const bool compositeBackground);

12
vtkm/rendering/MapperWireframer.h
View File

@ -42,8 +42,8 @@ public:
MapperWireframer();
virtual ~MapperWireframer();
virtual vtkm::rendering::Canvas* GetCanvas() const VTKM_OVERRIDE;
virtual void SetCanvas(vtkm::rendering::Canvas* canvas) VTKM_OVERRIDE;
virtual vtkm::rendering::Canvas* GetCanvas() const override;
virtual void SetCanvas(vtkm::rendering::Canvas* canvas) override;
bool GetShowInternalZones() const;
void SetShowInternalZones(bool showInternalZones);
@ -51,17 +51,17 @@ public:
bool GetIsOverlay() const;
void SetIsOverlay(bool isOverlay);
virtual void StartScene() VTKM_OVERRIDE;
virtual void EndScene() VTKM_OVERRIDE;
virtual void StartScene() override;
virtual void EndScene() override;
virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
const vtkm::cont::CoordinateSystem& coords,
const vtkm::cont::Field& scalarField,
const vtkm::rendering::ColorTable& colorTable,
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) VTKM_OVERRIDE;
const vtkm::Range& scalarRange) override;
virtual vtkm::rendering::Mapper* NewCopy() const VTKM_OVERRIDE;
virtual vtkm::rendering::Mapper* NewCopy() const override;
private:
struct InternalsType;

2
vtkm/rendering/TextAnnotationBillboard.h
View File

@ -48,7 +48,7 @@ public:
void Render(const vtkm::rendering::Camera& camera,
const vtkm::rendering::WorldAnnotator& worldAnnotator,
vtkm::rendering::Canvas& canvas) const VTKM_OVERRIDE;
vtkm::rendering::Canvas& canvas) const override;
};
}
} // namespace vtkm::rendering

2
vtkm/rendering/TextAnnotationScreen.h
View File

@ -48,7 +48,7 @@ public:
void Render(const vtkm::rendering::Camera& camera,
const vtkm::rendering::WorldAnnotator& annotator,
vtkm::rendering::Canvas& canvas) const VTKM_OVERRIDE;
vtkm::rendering::Canvas& canvas) const override;
};
}
} // namespace vtkm::rendering

6
vtkm/rendering/View1D.h
View File

@ -45,9 +45,9 @@ public:
~View1D();
void Paint() VTKM_OVERRIDE;
void RenderScreenAnnotations() VTKM_OVERRIDE;
void RenderWorldAnnotations() VTKM_OVERRIDE;
void Paint() override;
void RenderScreenAnnotations() override;
void RenderWorldAnnotations() override;
void RenderColorLegendAnnotations();
void EnableLegend();

6
vtkm/rendering/View2D.h
View File

@ -46,11 +46,11 @@ public:
~View2D();
void Paint() VTKM_OVERRIDE;
void Paint() override;
void RenderScreenAnnotations() VTKM_OVERRIDE;
void RenderScreenAnnotations() override;
void RenderWorldAnnotations() VTKM_OVERRIDE;
void RenderWorldAnnotations() override;
private:
void UpdateCameraProperties();

6
vtkm/rendering/View3D.h
View File

@ -47,11 +47,11 @@ public:
~View3D();
void Paint() VTKM_OVERRIDE;
void Paint() override;
void RenderScreenAnnotations() VTKM_OVERRIDE;
void RenderScreenAnnotations() override;
void RenderWorldAnnotations() VTKM_OVERRIDE;
void RenderWorldAnnotations() override;
private:
// 3D-specific annotations

4
vtkm/rendering/WorldAnnotatorGL.h
View File

@ -42,7 +42,7 @@ public:
const vtkm::Vec<vtkm::Float64, 3>& point1,
vtkm::Float32 lineWidth,
const vtkm::rendering::Color& color,
bool inFront) const VTKM_OVERRIDE;
bool inFront) const override;
void AddText(const vtkm::Vec<vtkm::Float32, 3>& origin,
const vtkm::Vec<vtkm::Float32, 3>& right,
@ -50,7 +50,7 @@ public:
vtkm::Float32 scale,
const vtkm::Vec<vtkm::Float32, 2>& anchor,
const vtkm::rendering::Color& color,
const std::string& text) const VTKM_OVERRIDE;
const std::string& text) const override;
private:
BitmapFont Font;