From ee53f78b653f9836f9193ae39d76f917275a01b7 Mon Sep 17 00:00:00 2001 From: Max Lyon Date: Tue, 2 Mar 2021 11:14:46 +0100 Subject: [PATCH] fix indentation --- src/OpenMesh/Core/Utils/typename.hh | 34 ++++++++++----------- src/Unittests/unittests_read_write_OM.cc | 39 ++++++++++++------------ 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/OpenMesh/Core/Utils/typename.hh b/src/OpenMesh/Core/Utils/typename.hh index 6e6addc0..9b678711 100644 --- a/src/OpenMesh/Core/Utils/typename.hh +++ b/src/OpenMesh/Core/Utils/typename.hh @@ -30,27 +30,27 @@ std::string get_type_name() inline std::string get_string_for_type(OpenMesh::FaceHandle){ return "facehandle";} inline std::string get_string_for_type(OpenMesh::EdgeHandle){ return "edgehandle";} -inline std::string get_string_for_type(OpenMesh::HalfedgeHandle){ return "halfedgehandle";} -inline std::string get_string_for_type(OpenMesh::VertexHandle){ return "vertexhandle";} -inline std::string get_string_for_type(OpenMesh::MeshHandle){ return "meshhandle";} +inline std::string get_string_for_type(OpenMesh::HalfedgeHandle){ return "halfedgehandle";} +inline std::string get_string_for_type(OpenMesh::VertexHandle){ return "vertexhandle";} +inline std::string get_string_for_type(OpenMesh::MeshHandle){ return "meshhandle";} -inline std::string get_string_for_type(bool){ return "bool";} -inline std::string get_string_for_type(char){ return "char";} -inline std::string get_string_for_type(signed char){ return "signed char";} -inline std::string get_string_for_type(double){ return "double";} -inline std::string get_string_for_type(float){ return "float";} -inline std::string get_string_for_type(int){ return "int";} -inline std::string get_string_for_type(short){ return "short";} +inline std::string get_string_for_type(bool){ return "bool";} +inline std::string get_string_for_type(char){ return "char";} +inline std::string get_string_for_type(signed char){ return "signed char";} +inline std::string get_string_for_type(double){ return "double";} +inline std::string get_string_for_type(float){ return "float";} +inline std::string get_string_for_type(int){ return "int";} +inline std::string get_string_for_type(short){ return "short";} -inline std::string get_string_for_type(unsigned char){ return "uchar";} -inline std::string get_string_for_type(unsigned int){ return "uint";} -inline std::string get_string_for_type(unsigned short){ return "ushort";} -inline std::string get_string_for_type(unsigned long){ return "ulong";} +inline std::string get_string_for_type(unsigned char){ return "uchar";} +inline std::string get_string_for_type(unsigned int){ return "uint";} +inline std::string get_string_for_type(unsigned short){ return "ushort";} +inline std::string get_string_for_type(unsigned long){ return "ulong";} -inline std::string get_string_for_type(std::string){ return "std::string";} +inline std::string get_string_for_type(std::string){ return "std::string";} -template std::string get_string_for_type(T){return "unknown";} -template std::string get_string_for_type(std::vector){ return "std::vector<" + get_string_for_type(T()) + ">";} +template std::string get_string_for_type(T){return "unknown";} +template std::string get_string_for_type(std::vector){ return "std::vector<" + get_string_for_type(T()) + ">";} template std::string get_string_for_type(OpenMesh::VectorT) { return "VectorT<" + get_string_for_type(T()) + ", " + std::to_string(Dim) + ">";} diff --git a/src/Unittests/unittests_read_write_OM.cc b/src/Unittests/unittests_read_write_OM.cc index fdd37f90..413fbf47 100644 --- a/src/Unittests/unittests_read_write_OM.cc +++ b/src/Unittests/unittests_read_write_OM.cc @@ -1640,25 +1640,24 @@ void do_all_property_types_vec_all_dim(MeshT& _mesh, PropertyAction action) template void do_all_property_types(MeshT& _mesh, PropertyAction action, int version) { - // TODO: add support for commented out types - do_property (_mesh, action); - do_property (_mesh, action); - do_property (_mesh, action); - do_property (_mesh, action); - do_property (_mesh, action); + do_property (_mesh, action); + do_property (_mesh, action); + do_property (_mesh, action); + do_property (_mesh, action); + do_property (_mesh, action); - if(version >= 22) - { - do_property> (_mesh, action); - do_property> (_mesh, action); - do_property> (_mesh, action); - do_property> (_mesh, action); + if(version >= 22) + { + do_property> (_mesh, action); + do_property> (_mesh, action); + do_property> (_mesh, action); + do_property> (_mesh, action); - do_property>> (_mesh, action); - //do_property> (_mesh, action); - } + do_property>> (_mesh, action); + //do_property> (_mesh, action); + } - do_all_property_types_vec_all_dim(_mesh, action); + do_all_property_types_vec_all_dim(_mesh, action); } template @@ -1867,10 +1866,10 @@ TEST_F(OpenMeshReadWriteOM, WriteAndLoadBoolCheckSpaces) { // Check if the property is still ok for (unsigned int i = 0; i < 8; ++i) { - if ( i == 5) - EXPECT_TRUE( mesh.property(prop,mesh2.vertex_handle((i)) ) ); - else - EXPECT_FALSE(mesh.property(prop,mesh2.vertex_handle((i)))); + if ( i == 5) + EXPECT_TRUE( mesh.property(prop,mesh2.vertex_handle((i)) ) ); + else + EXPECT_FALSE(mesh.property(prop,mesh2.vertex_handle((i)))); } }