From 6db85898d72e4488477e894609a4a1099edcd51f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 28 Feb 2014 11:51:42 +0100
Subject: [PATCH] Adding namespace InSituLib.
---
InSituLib/VtkMeshNodalCoordinatesTemplate-impl.h | 4 ++++
InSituLib/VtkMeshNodalCoordinatesTemplate.h | 5 +++++
Tests/InSituLib/TestVtkMeshNodalCoordinatesTemplate.cpp | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/InSituLib/VtkMeshNodalCoordinatesTemplate-impl.h b/InSituLib/VtkMeshNodalCoordinatesTemplate-impl.h
index e68e9279761..1e2b67ff44b 100644
--- a/InSituLib/VtkMeshNodalCoordinatesTemplate-impl.h
+++ b/InSituLib/VtkMeshNodalCoordinatesTemplate-impl.h
@@ -21,6 +21,8 @@
#include <vtkVariant.h>
#include <vtkVariantCast.h>
+namespace InSituLib {
+
// Can't use vtkStandardNewMacro with a template.
template <class Scalar> VtkMeshNodalCoordinatesTemplate<Scalar> *
VtkMeshNodalCoordinatesTemplate<Scalar>::New()
@@ -428,3 +430,5 @@ template <class Scalar> vtkIdType VtkMeshNodalCoordinatesTemplate<Scalar>
}
return -1;
}
+
+} // end namespace
diff --git a/InSituLib/VtkMeshNodalCoordinatesTemplate.h b/InSituLib/VtkMeshNodalCoordinatesTemplate.h
index b562a607844..1ff9f1b69b5 100644
--- a/InSituLib/VtkMeshNodalCoordinatesTemplate.h
+++ b/InSituLib/VtkMeshNodalCoordinatesTemplate.h
@@ -19,6 +19,9 @@
#include <vtkTypeTemplate.h> // For templated vtkObject API
#include <vtkObjectFactory.h> // for vtkStandardNewMacro
+namespace InSituLib
+{
+
template <class Scalar>
class VtkMeshNodalCoordinatesTemplate:
public vtkTypeTemplate<VtkMeshNodalCoordinatesTemplate<Scalar>,
@@ -100,6 +103,8 @@ private:
double *TempDoubleArray;
};
+} // end namespace
+
#include "VtkMeshNodalCoordinatesTemplate-impl.h"
#endif // VTKMESHNODALCOORDINATES_H_
diff --git a/Tests/InSituLib/TestVtkMeshNodalCoordinatesTemplate.cpp b/Tests/InSituLib/TestVtkMeshNodalCoordinatesTemplate.cpp
index e6841d5a396..611aeac333c 100644
--- a/Tests/InSituLib/TestVtkMeshNodalCoordinatesTemplate.cpp
+++ b/Tests/InSituLib/TestVtkMeshNodalCoordinatesTemplate.cpp
@@ -28,7 +28,7 @@ TEST(InSituLibNodalCoordinates, Init)
MeshLib::Mesh* mesh = MeshLib::MeshGenerator::generateRegularQuadMesh(length, subdivisions);
- vtkNew<VtkMeshNodalCoordinatesTemplate<double> > nodeCoords;
+ vtkNew<InSituLib::VtkMeshNodalCoordinatesTemplate<double> > nodeCoords;
nodeCoords->SetNodes(mesh->getNodes());
//nodeCoords->PrintSelf(std::cout, vtkIndent());
--
GitLab