From c6da50a483a66a9afc7f870a8a97ae64f9dfdbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 13 Apr 2021 10:09:31 +0200 Subject: [PATCH 1/7] Fixed warning --- src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh index 928b14fe..70fc7fdf 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh @@ -87,9 +87,6 @@ public: explicit VHierarchyNodeIndex(unsigned int _value) { value_ = _value; } - VHierarchyNodeIndex(const VHierarchyNodeIndex &_other) - { value_ = _other.value_; } - VHierarchyNodeIndex(unsigned int _tree_id, unsigned int _node_id, unsigned short _tree_id_bits) From 7bf1b942248a5b5476ba0780f62f45daeebe84cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Apr 2021 12:25:24 +0200 Subject: [PATCH 2/7] Fixed cppcheck warning --- src/OpenMesh/Core/IO/reader/PLYReader.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index db431c14..84d9fd78 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -54,6 +54,7 @@ #include #include #include +#include #ifndef WIN32 #endif @@ -1089,7 +1090,7 @@ std::string get_property_name(std::string _string1, std::string _string2) { //----------------------------------------------------------------------------- -_PLYReader_::ValueType get_property_type(std::string& _string1, std::string& _string2) { +_PLYReader_::ValueType get_property_type(const std::string& _string1, const std::string& _string2) { if (_string1 == "float32" || _string2 == "float32") From 9d0a7f5e6cd2ca50edb93023c0500f1924c31536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Apr 2021 13:45:19 +0200 Subject: [PATCH 3/7] Skit the gtest root --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index ff35c196..5ac59034 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,7 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" +OPTIONS="" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; From 4db885556a40bfe4dcc5bde2c4802f4d4a22e9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Apr 2021 13:46:42 +0200 Subject: [PATCH 4/7] Use right gtest --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 5ac59034..afe15d6f 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,7 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="" +OPTIONS="-DGTEST_ROOT= ~/sw/gtest-1.10.0/" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; From ab0bc7de42ae69a734949dce5a672e7770986395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Apr 2021 13:50:16 +0200 Subject: [PATCH 5/7] Use right gtest --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index afe15d6f..5e3a930e 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,7 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="-DGTEST_ROOT= ~/sw/gtest-1.10.0/" +OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0/lib/cmake/" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; From 66f08232fbe9a6a7813a19a7b36add9ea9faf5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Apr 2021 13:52:01 +0200 Subject: [PATCH 6/7] Use right gtest --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 5e3a930e..6074282d 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,7 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0/lib/cmake/" +OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0/lib" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; From e710d4cb6f1db9081b388a5114104e3f4787326a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Apr 2021 13:54:31 +0200 Subject: [PATCH 7/7] Use right gtest --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 6074282d..485057f5 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,7 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0/lib" +OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC";