From aebe2c665646fc0c2e6a680aaf2821fcee626ea3 Mon Sep 17 00:00:00 2001
From: "David E. DeMarle" <dave.demarle@kitware.com>
Date: Fri, 27 Oct 2017 13:22:52 -0400
Subject: [PATCH] fix header test and use the recent c++11 markups
---
Rendering/OSPRay/vtkOSPRayTetrahedraMapperNode.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Rendering/OSPRay/vtkOSPRayTetrahedraMapperNode.h b/Rendering/OSPRay/vtkOSPRayTetrahedraMapperNode.h
index 343e78042df..b15cb135c3a 100644
--- a/Rendering/OSPRay/vtkOSPRayTetrahedraMapperNode.h
+++ b/Rendering/OSPRay/vtkOSPRayTetrahedraMapperNode.h
@@ -43,23 +43,23 @@ namespace osp
struct vec3f;
}
-class VTKRENDERINGVOLUME_EXPORT vtkOSPRayTetrahedraMapperNode : public vtkVolumeMapperNode
+class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayTetrahedraMapperNode : public vtkVolumeMapperNode
{
public:
vtkTypeMacro(vtkOSPRayTetrahedraMapperNode,
vtkVolumeMapperNode);
static vtkOSPRayTetrahedraMapperNode *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
protected:
vtkOSPRayTetrahedraMapperNode();
- ~vtkOSPRayTetrahedraMapperNode() VTK_OVERRIDE;
+ ~vtkOSPRayTetrahedraMapperNode() override;
int NumColors;
double SamplingRate;
@@ -80,8 +80,8 @@ protected:
std::vector<float> field;
private:
- vtkOSPRayTetrahedraMapperNode(const vtkOSPRayTetrahedraMapperNode&) VTK_DELETE_FUNCTION;
- void operator=(const vtkOSPRayTetrahedraMapperNode &) VTK_DELETE_FUNCTION;
+ vtkOSPRayTetrahedraMapperNode(const vtkOSPRayTetrahedraMapperNode&) = delete;
+ void operator=(const vtkOSPRayTetrahedraMapperNode &) = delete;
};
#endif
--
GitLab