Commit 4cea26e1 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'fix-warnings' into 'master'

Fix warnings

See merge request !48
parents 37bd6fd8 58ce8a8c
Pipeline #8708 passed with stage
in 3 minutes and 51 seconds
...@@ -97,7 +97,7 @@ class EdgePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, EdgePropHan ...@@ -97,7 +97,7 @@ class EdgePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, EdgePropHan
public: public:
EdgePropertyT(const std::string& _name, ResourceManager& _resMan, EdgePropHandle _handle, const T _def = T()); EdgePropertyT(const std::string& _name, ResourceManager& _resMan, EdgePropHandle _handle, const T _def = T());
virtual ~EdgePropertyT() {} virtual ~EdgePropertyT() {}
virtual BaseProperty* clone(ResourceManager &_resMan, const OpenVolumeMeshHandle _handle) const; virtual BaseProperty* clone(ResourceManager &_resMan, OpenVolumeMeshHandle _handle) const;
virtual void serialize(std::ostream& _ostr) const; virtual void serialize(std::ostream& _ostr) const;
virtual void deserialize(std::istream& _istr); virtual void deserialize(std::istream& _istr);
virtual const std::string entityType() const { return "EProp"; } virtual const std::string entityType() const { return "EProp"; }
...@@ -110,7 +110,7 @@ class HalfEdgePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, HalfEdg ...@@ -110,7 +110,7 @@ class HalfEdgePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, HalfEdg
public: public:
HalfEdgePropertyT(const std::string& _name, ResourceManager& _resMan, HalfEdgePropHandle _handle, const T _def = T()); HalfEdgePropertyT(const std::string& _name, ResourceManager& _resMan, HalfEdgePropHandle _handle, const T _def = T());
virtual ~HalfEdgePropertyT() {} virtual ~HalfEdgePropertyT() {}
virtual BaseProperty* clone(ResourceManager &_resMan, const OpenVolumeMeshHandle _handle) const; virtual BaseProperty* clone(ResourceManager &_resMan, OpenVolumeMeshHandle _handle) const;
virtual void serialize(std::ostream& _ostr) const; virtual void serialize(std::ostream& _ostr) const;
virtual void deserialize(std::istream& _istr); virtual void deserialize(std::istream& _istr);
virtual const std::string entityType() const { return "HEProp"; } virtual const std::string entityType() const { return "HEProp"; }
...@@ -123,7 +123,7 @@ class FacePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, FacePropHan ...@@ -123,7 +123,7 @@ class FacePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, FacePropHan
public: public:
FacePropertyT(const std::string& _name, ResourceManager& _resMan, FacePropHandle _handle, const T _def = T()); FacePropertyT(const std::string& _name, ResourceManager& _resMan, FacePropHandle _handle, const T _def = T());
virtual ~FacePropertyT() {} virtual ~FacePropertyT() {}
virtual BaseProperty* clone(ResourceManager &_resMan, const OpenVolumeMeshHandle _handle) const; virtual BaseProperty* clone(ResourceManager &_resMan, OpenVolumeMeshHandle _handle) const;
virtual void serialize(std::ostream& _ostr) const; virtual void serialize(std::ostream& _ostr) const;
virtual void deserialize(std::istream& _istr); virtual void deserialize(std::istream& _istr);
virtual const std::string entityType() const { return "FProp"; } virtual const std::string entityType() const { return "FProp"; }
...@@ -136,7 +136,7 @@ class HalfFacePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, HalfFac ...@@ -136,7 +136,7 @@ class HalfFacePropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, HalfFac
public: public:
HalfFacePropertyT(const std::string& _name, ResourceManager& _resMan, HalfFacePropHandle _handle, const T _def = T()); HalfFacePropertyT(const std::string& _name, ResourceManager& _resMan, HalfFacePropHandle _handle, const T _def = T());
virtual ~HalfFacePropertyT() {} virtual ~HalfFacePropertyT() {}
virtual BaseProperty* clone(ResourceManager &_resMan, const OpenVolumeMeshHandle _handle) const; virtual BaseProperty* clone(ResourceManager &_resMan, OpenVolumeMeshHandle _handle) const;
virtual void serialize(std::ostream& _ostr) const; virtual void serialize(std::ostream& _ostr) const;
virtual void deserialize(std::istream& _istr); virtual void deserialize(std::istream& _istr);
virtual const std::string entityType() const { return "HFProp"; } virtual const std::string entityType() const { return "HFProp"; }
...@@ -149,7 +149,7 @@ class CellPropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, CellPropHan ...@@ -149,7 +149,7 @@ class CellPropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, CellPropHan
public: public:
CellPropertyT(const std::string& _name, ResourceManager& _resMan, CellPropHandle _handle, const T _def = T()); CellPropertyT(const std::string& _name, ResourceManager& _resMan, CellPropHandle _handle, const T _def = T());
virtual ~CellPropertyT() {} virtual ~CellPropertyT() {}
virtual BaseProperty* clone(ResourceManager &_resMan, const OpenVolumeMeshHandle _handle) const; virtual BaseProperty* clone(ResourceManager &_resMan, OpenVolumeMeshHandle _handle) const;
virtual void serialize(std::ostream& _ostr) const; virtual void serialize(std::ostream& _ostr) const;
virtual void deserialize(std::istream& _istr); virtual void deserialize(std::istream& _istr);
virtual const std::string entityType() const { return "CProp"; } virtual const std::string entityType() const { return "CProp"; }
...@@ -162,7 +162,7 @@ class MeshPropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, MeshPropHan ...@@ -162,7 +162,7 @@ class MeshPropertyT : public PropertyPtr<OpenVolumeMeshPropertyT<T>, MeshPropHan
public: public:
MeshPropertyT(const std::string& _name, ResourceManager& _resMan, MeshPropHandle _handle, const T _def = T()); MeshPropertyT(const std::string& _name, ResourceManager& _resMan, MeshPropHandle _handle, const T _def = T());
virtual ~MeshPropertyT() {} virtual ~MeshPropertyT() {}
virtual BaseProperty* clone(ResourceManager &_resMan, const OpenVolumeMeshHandle _handle) const; virtual BaseProperty* clone(ResourceManager &_resMan, OpenVolumeMeshHandle _handle) const;
virtual void serialize(std::ostream& _ostr) const; virtual void serialize(std::ostream& _ostr) const;
virtual void deserialize(std::istream& _istr); virtual void deserialize(std::istream& _istr);
virtual const std::string entityType() const { return "MProp"; } virtual const std::string entityType() const { return "MProp"; }
......
This diff is collapsed.
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#include <OpenVolumeMesh/Mesh/TetrahedralMesh.hh> #include <OpenVolumeMesh/Mesh/TetrahedralMesh.hh>
#include <OpenVolumeMesh/Geometry/VectorT.hh> #include <OpenVolumeMesh/Geometry/VectorT.hh>
#define EXPECT_HANDLE_EQ(a, b) EXPECT_EQ((a).idx(), (b).idx())
#define EXPECT_HANDLE_NE(a, b) EXPECT_NE((a).idx(), (b).idx())
/* /*
* Simple test setting for polyhedral meshes * Simple test setting for polyhedral meshes
*/ */
......
...@@ -12,14 +12,14 @@ TEST_F(HexahedralMeshBase, HexVertexIterTest) { ...@@ -12,14 +12,14 @@ TEST_F(HexahedralMeshBase, HexVertexIterTest) {
EXPECT_TRUE(hv_it.valid()); EXPECT_TRUE(hv_it.valid());
EXPECT_EQ(VertexHandle(0), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(0), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(1), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(1), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(2), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(2), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(3), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(3), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(4), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(4), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(7), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(7), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(6), *hv_it); ++hv_it; EXPECT_HANDLE_EQ(VertexHandle(6), *hv_it); ++hv_it;
EXPECT_EQ(VertexHandle(5), *hv_it); EXPECT_HANDLE_EQ(VertexHandle(5), *hv_it);
} }
TEST_F(TetrahedralMeshBase, VertexVertexIteratorTest) { TEST_F(TetrahedralMeshBase, VertexVertexIteratorTest) {
......
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