Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_warnings' into 'master'

Browse Source 
Fix warnings

See merge request OpenMesh/OpenMesh!243
This commit is contained in:
Jan Möbius
2019-12-21 11:16:41 +01:00
parent 6a6175ff4e debce64d31
commit 6603442b06
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenMesh/Core/Mesh/Handles.hh
View File

@@ -59,7 +59,7 @@ namespace OpenMesh {
/// Base class for all handle types /// Base class for all handle types
class BaseHandle class OPENMESHDLLEXPORT BaseHandle
{ {
public: public:
@@ -117,35 +117,35 @@ inline std::ostream& operator<<(std::ostream& _os, const BaseHandle& _hnd)
/// Handle for a vertex entity /// Handle for a vertex entity
struct VertexHandle : public BaseHandle struct OPENMESHDLLEXPORT VertexHandle : public BaseHandle
{ {
explicit VertexHandle(int _idx=-1) : BaseHandle(_idx) {} explicit VertexHandle(int _idx=-1) : BaseHandle(_idx) {}
}; };
/// Handle for a halfedge entity /// Handle for a halfedge entity
struct HalfedgeHandle : public BaseHandle struct OPENMESHDLLEXPORT HalfedgeHandle : public BaseHandle
{ {
explicit HalfedgeHandle(int _idx=-1) : BaseHandle(_idx) {} explicit HalfedgeHandle(int _idx=-1) : BaseHandle(_idx) {}
}; };
/// Handle for a edge entity /// Handle for a edge entity
struct EdgeHandle : public BaseHandle struct OPENMESHDLLEXPORT EdgeHandle : public BaseHandle
{ {
explicit EdgeHandle(int _idx=-1) : BaseHandle(_idx) {} explicit EdgeHandle(int _idx=-1) : BaseHandle(_idx) {}
}; };
/// Handle for a face entity /// Handle for a face entity
struct FaceHandle : public BaseHandle struct OPENMESHDLLEXPORT FaceHandle : public BaseHandle
{ {
explicit FaceHandle(int _idx=-1) : BaseHandle(_idx) {} explicit FaceHandle(int _idx=-1) : BaseHandle(_idx) {}
}; };
/// Handle type for meshes to simplify some template programming /// Handle type for meshes to simplify some template programming
struct MeshHandle : public BaseHandle struct OPENMESHDLLEXPORT MeshHandle : public BaseHandle
{ {
explicit MeshHandle(int _idx=-1) : BaseHandle(_idx) {} explicit MeshHandle(int _idx=-1) : BaseHandle(_idx) {}
}; };

6
src/Unittests/unittests_smart_ranges.cc
View File

@@ -159,14 +159,14 @@ protected:
template <typename HandleT> template <typename HandleT>
struct F struct F
{ {
int operator()(HandleT ) { return 1; } unsigned int operator()(HandleT ) { return 1; }
}; };
/* Test if smart ranges work /* Test if smart ranges work
*/ */
TEST_F(OpenMeshSmartRanges, Sum) TEST_F(OpenMeshSmartRanges, Sum)
{ {
auto one = [](OpenMesh::VertexHandle ) { return 1; }; auto one = [](OpenMesh::VertexHandle ) { return 1u; };
EXPECT_EQ(mesh_.vertices().sum(one), mesh_.n_vertices()); EXPECT_EQ(mesh_.vertices().sum(one), mesh_.n_vertices());
EXPECT_EQ(mesh_.vertices().sum(F<OpenMesh::VertexHandle>()), mesh_.n_vertices()); EXPECT_EQ(mesh_.vertices().sum(F<OpenMesh::VertexHandle>()), mesh_.n_vertices());
EXPECT_EQ(mesh_.halfedges().sum(F<OpenMesh::HalfedgeHandle>()), mesh_.n_halfedges()); EXPECT_EQ(mesh_.halfedges().sum(F<OpenMesh::HalfedgeHandle>()), mesh_.n_halfedges());
@@ -189,7 +189,7 @@ TEST_F(OpenMeshSmartRanges, Sum)
for (auto fh : mesh_.faces()) for (auto fh : mesh_.faces())
EXPECT_EQ(fh.edges().sum(F<OpenMesh::EdgeHandle>()), mesh_.valence(fh)); EXPECT_EQ(fh.edges().sum(F<OpenMesh::EdgeHandle>()), mesh_.valence(fh));
for (auto fh : mesh_.faces()) for (auto fh : mesh_.faces())
EXPECT_EQ(fh.faces().sum(F<OpenMesh::FaceHandle>()), 3); EXPECT_EQ(fh.faces().sum(F<OpenMesh::FaceHandle>()), 3u);
} }