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

Merge branch 'master' of gitlab.vci.rwth-aachen.de:OpenMesh/OpenMesh

Browse Source
This commit is contained in:
Jan Möbius
2023-06-27 10:56:15 +02:00
parent 6e389b82e6 3db3606841
commit ef4da2c028
5 changed files with 6 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
.gitlab-ci.yml
View File

@@ -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

2
CI/gitlab-ci/linux.yml
View File

@@ -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}

3
CI/gitlab-ci/mac.yml
View File

@@ -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}

4
CMakeLists.txt
View File

@@ -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()

4
src/OpenMesh/Core/Utils/Property.hh
View File

@@ -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