From 998eec1390dcabbb502dc1ac1bc17cd09a16e343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 26 Jun 2023 16:16:47 +0200 Subject: [PATCH 1/3] Use emplace_back instead of push_back --- src/OpenMesh/Core/Utils/Property.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index 438a6317..485d3072 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/src/OpenMesh/Core/Utils/Property.hh @@ -117,7 +117,7 @@ public: // inherited from BaseProperty virtual void reserve(size_t _n) override { data_.reserve(_n); } virtual void resize(size_t _n) override { data_.resize(_n); } virtual void clear() override { data_.clear(); vector_type().swap(data_); } - virtual void push_back() override { data_.push_back(T()); } + virtual void push_back() override { data_.emplace_back(); } virtual void swap(size_t _i0, size_t _i1) override { std::swap(data_[_i0], data_[_i1]); } virtual void copy(size_t _i0, size_t _i1) override @@ -250,7 +250,7 @@ public: // inherited from BaseProperty virtual void reserve(size_t _n) override { data_.reserve(_n); } virtual void resize(size_t _n) override { data_.resize(_n); } virtual void clear() override { data_.clear(); vector_type().swap(data_); } - virtual void push_back() override { data_.push_back(bool()); } + virtual void push_back() override { data_.emplace_back(); } virtual void swap(size_t _i0, size_t _i1) override { bool t(data_[_i0]); data_[_i0]=data_[_i1]; data_[_i1]=t; } virtual void copy(size_t _i0, size_t _i1) override From 4b4e56388ebc66a4e13c85e5213ad16a11d16364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 26 Jun 2023 16:26:19 +0200 Subject: [PATCH 2/3] Try external cxx standard --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e087cb5b..be8d00c6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) # Set and enforce C++-11 flags -set( CMAKE_CXX_STANDARD_REQUIRED TRUE ) -set( CMAKE_CXX_STANDARD 11 ) +#set( CMAKE_CXX_STANDARD_REQUIRED TRUE ) +#set( CMAKE_CXX_STANDARD 11 ) enable_testing() From 66f5dc1a5ac19cc0dfeff782d60742871454e670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 27 Jun 2023 08:49:40 +0200 Subject: [PATCH 3/3] Disable iwyu job Removed old cpp11 mac unit tests --- .gitlab-ci.yml | 66 +----------------------------------------- CI/gitlab-ci/linux.yml | 2 +- CI/gitlab-ci/mac.yml | 3 -- 3 files changed, 2 insertions(+), 69 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4feb3435..09dbbe73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -482,30 +482,7 @@ test-release-clang-cpp14-qt5.15.1: -#----------- Job Informations: -# Type: Build: release -# OS: Linux -# Compiler: clang -# Language: cpp14 - -iwyu-release-clang-cpp14-qt5.15.1: - stage: build - script: "CI/ci-linux-build.sh" - image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container - tags: - - Linux - - stretch - variables: - COMPILER: "clang" - LANGUAGE: "cpp14" - BUILD_TYPE: "release" - QTVERSION: "qt5.15.1" - IWYU: "yes" - VECTORCHECKS: "yes" - artifacts: - paths: - - build-clang-cpp14-qt5.15.1-release-iwyu-vectorchecks/compile_commands.json - - build-clang-cpp14-qt5.15.1-release-iwyu-vectorchecks/iwyu.dump +#{linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} #----------- Job Informations: # Type: Build: release # OS: Linux @@ -534,47 +511,6 @@ nvc-release-clang-cpp14-qt5.15.1: # MAC tasks # ----------------- -#----------- Job Informations: -# Type: Build+Test: debug -# OS: Mac -# Language: cpp11 - -macos-cpp11-debug: - stage: build - script: "CI/ci-mac-build.sh cpp11 debug ; CI/ci-mac-test.sh cpp11 debug" - tags: - - Apple - artifacts: - paths: - - build-debug-cpp11/*.dmg - - build-debug-cpp11/*.tar.gz -# reports: -# junit: -# - build-debug-cpp11/Unittests/report.xml -# - build-debug-cpp11/Unittests/report-customvec.xml -# - build-debug-cpp11/Unittests/report-doublevec.xml - -#----------- Job Informations: -# Type: Build+Test: release -# OS: Mac -# Language: cpp11 - -macos-cpp11-release: - stage: build - script: "CI/ci-mac-build.sh cpp11 release ; CI/ci-mac-test.sh cpp11 release" - tags: - - Apple - artifacts: - paths: - - build-release-cpp11/*.dmg - - build-release-cpp11/*.tar.gz -# reports: -# junit: -# - build-release-cpp11/Unittests/report.xml -# - build-release-cpp11/Unittests/report-customvec.xml -# - build-release-cpp11/Unittests/report-doublevec.xml - - #----------- Job Informations: # Type: Build+Test: debug # OS: Mac diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index abb53a8b..5499c5fa 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -18,5 +18,5 @@ cppcheck: {linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} {linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} -{linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} +#{linux-iwyu-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} {linux-novchecks-job.yml, BUILDTYPE=release, COMPILER=clang, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} diff --git a/CI/gitlab-ci/mac.yml b/CI/gitlab-ci/mac.yml index 57d973c2..40107d97 100644 --- a/CI/gitlab-ci/mac.yml +++ b/CI/gitlab-ci/mac.yml @@ -2,9 +2,6 @@ # MAC tasks # ----------------- -{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp11} -{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp11} - {mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp14} {mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp14}