From e49f27a3ac7e4a874b1805f1dc84c193c69d6f05 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 2 Nov 2017 08:36:05 -0400 Subject: [PATCH] Remove all uses of VTKM_OVERRIDE at instead just use override. Since VTK-m now requires C++11 it is safe to remove our custom defines and move to using the keyword directly. --- vtkm/cont/CellSetExplicit.h | 10 ++++---- vtkm/cont/Error.h | 4 ++-- vtkm/rendering/AxisAnnotation2D.h | 2 +- vtkm/rendering/AxisAnnotation3D.h | 2 +- vtkm/rendering/CanvasEGL.h | 6 ++--- vtkm/rendering/CanvasGL.h | 30 ++++++++++++------------ vtkm/rendering/CanvasOSMesa.h | 10 ++++---- vtkm/rendering/CanvasRayTracer.h | 2 +- vtkm/rendering/MapperConnectivity.h | 12 +++++----- vtkm/rendering/MapperGL.h | 12 +++++----- vtkm/rendering/MapperRayTracer.h | 12 +++++----- vtkm/rendering/MapperVolume.h | 12 +++++----- vtkm/rendering/MapperWireframer.h | 12 +++++----- vtkm/rendering/TextAnnotationBillboard.h | 2 +- vtkm/rendering/TextAnnotationScreen.h | 2 +- vtkm/rendering/View1D.h | 6 ++--- vtkm/rendering/View2D.h | 6 ++--- vtkm/rendering/View3D.h | 6 ++--- vtkm/rendering/WorldAnnotatorGL.h | 4 ++-- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index 47dbed10d..d302f26f5 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -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; diff --git a/vtkm/cont/Error.h b/vtkm/cont/Error.h index b2144b38c..4a036a76e 100644 --- a/vtkm/cont/Error.h +++ b/vtkm/cont/Error.h @@ -27,7 +27,7 @@ #include #include -#include // For VTKM_OVERRIDE +#include // 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() {} diff --git a/vtkm/rendering/AxisAnnotation2D.h b/vtkm/rendering/AxisAnnotation2D.h index 1c7da50d4..1ae48e751 100644 --- a/vtkm/rendering/AxisAnnotation2D.h +++ b/vtkm/rendering/AxisAnnotation2D.h @@ -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 diff --git a/vtkm/rendering/AxisAnnotation3D.h b/vtkm/rendering/AxisAnnotation3D.h index f3870541d..6fa953d01 100644 --- a/vtkm/rendering/AxisAnnotation3D.h +++ b/vtkm/rendering/AxisAnnotation3D.h @@ -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 diff --git a/vtkm/rendering/CanvasEGL.h b/vtkm/rendering/CanvasEGL.h index ae163cb3e..d55cf0d67 100644 --- a/vtkm/rendering/CanvasEGL.h +++ b/vtkm/rendering/CanvasEGL.h @@ -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 Internals; diff --git a/vtkm/rendering/CanvasGL.h b/vtkm/rendering/CanvasGL.h index d9a1a368e..f94deb4db 100644 --- a/vtkm/rendering/CanvasGL.h +++ b/vtkm/rendering/CanvasGL.h @@ -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& point0, const vtkm::Vec& 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& point0, const vtkm::Vec& point1, const vtkm::Vec& point2, const vtkm::Vec& point3, - const vtkm::rendering::Color& color) const VTKM_OVERRIDE; + const vtkm::rendering::Color& color) const override; void AddText(const vtkm::Vec& position, vtkm::Float32 scale, @@ -82,7 +82,7 @@ protected: vtkm::Float32 windowAspect, const vtkm::Vec& anchor, const vtkm::rendering::Color& color, - const std::string& text) const VTKM_OVERRIDE; + const std::string& text) const override; private: vtkm::rendering::BitmapFont Font; diff --git a/vtkm/rendering/CanvasOSMesa.h b/vtkm/rendering/CanvasOSMesa.h index a72697876..208659f35 100644 --- a/vtkm/rendering/CanvasOSMesa.h +++ b/vtkm/rendering/CanvasOSMesa.h @@ -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 Internals; diff --git a/vtkm/rendering/CanvasRayTracer.h b/vtkm/rendering/CanvasRayTracer.h index 42604dfa9..fd8c44ba1 100644 --- a/vtkm/rendering/CanvasRayTracer.h +++ b/vtkm/rendering/CanvasRayTracer.h @@ -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& rays, const vtkm::cont::ArrayHandle& colors, diff --git a/vtkm/rendering/MapperConnectivity.h b/vtkm/rendering/MapperConnectivity.h index 5b3310f8d..c2c8e1cb6 100644 --- a/vtkm/rendering/MapperConnectivity.h +++ b/vtkm/rendering/MapperConnectivity.h @@ -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: diff --git a/vtkm/rendering/MapperGL.h b/vtkm/rendering/MapperGL.h index dd48c60f4..7253ddbc9 100644 --- a/vtkm/rendering/MapperGL.h +++ b/vtkm/rendering/MapperGL.h @@ -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; diff --git a/vtkm/rendering/MapperRayTracer.h b/vtkm/rendering/MapperRayTracer.h index 55317a2bc..5d26cdb27 100644 --- a/vtkm/rendering/MapperRayTracer.h +++ b/vtkm/rendering/MapperRayTracer.h @@ -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; diff --git a/vtkm/rendering/MapperVolume.h b/vtkm/rendering/MapperVolume.h index 2e11f1039..70ae39ea9 100644 --- a/vtkm/rendering/MapperVolume.h +++ b/vtkm/rendering/MapperVolume.h @@ -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); diff --git a/vtkm/rendering/MapperWireframer.h b/vtkm/rendering/MapperWireframer.h index fcbfc3d9a..32d0afec6 100644 --- a/vtkm/rendering/MapperWireframer.h +++ b/vtkm/rendering/MapperWireframer.h @@ -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; diff --git a/vtkm/rendering/TextAnnotationBillboard.h b/vtkm/rendering/TextAnnotationBillboard.h index 57b23ac59..687bb57e8 100644 --- a/vtkm/rendering/TextAnnotationBillboard.h +++ b/vtkm/rendering/TextAnnotationBillboard.h @@ -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 diff --git a/vtkm/rendering/TextAnnotationScreen.h b/vtkm/rendering/TextAnnotationScreen.h index f9f406b30..04cebd99c 100644 --- a/vtkm/rendering/TextAnnotationScreen.h +++ b/vtkm/rendering/TextAnnotationScreen.h @@ -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 diff --git a/vtkm/rendering/View1D.h b/vtkm/rendering/View1D.h index c877af173..7923f05e6 100644 --- a/vtkm/rendering/View1D.h +++ b/vtkm/rendering/View1D.h @@ -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(); diff --git a/vtkm/rendering/View2D.h b/vtkm/rendering/View2D.h index f50dd1912..669dd1107 100644 --- a/vtkm/rendering/View2D.h +++ b/vtkm/rendering/View2D.h @@ -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(); diff --git a/vtkm/rendering/View3D.h b/vtkm/rendering/View3D.h index ed0e7cbb5..37644c83c 100644 --- a/vtkm/rendering/View3D.h +++ b/vtkm/rendering/View3D.h @@ -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 diff --git a/vtkm/rendering/WorldAnnotatorGL.h b/vtkm/rendering/WorldAnnotatorGL.h index f7a9973f5..6dd5b5ec8 100644 --- a/vtkm/rendering/WorldAnnotatorGL.h +++ b/vtkm/rendering/WorldAnnotatorGL.h @@ -42,7 +42,7 @@ public: const vtkm::Vec& point1, vtkm::Float32 lineWidth, const vtkm::rendering::Color& color, - bool inFront) const VTKM_OVERRIDE; + bool inFront) const override; void AddText(const vtkm::Vec& origin, const vtkm::Vec& right, @@ -50,7 +50,7 @@ public: vtkm::Float32 scale, const vtkm::Vec& anchor, const vtkm::rendering::Color& color, - const std::string& text) const VTKM_OVERRIDE; + const std::string& text) const override; private: BitmapFont Font;