Skip to content

Commit 17d50b9

Browse files
committed
Fix #14850 (Compilation fails on oraclelinux:8 (g++ 8.5.0 released in 2021))
1 parent a7faefc commit 17d50b9

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

.github/workflows/CI-unixish-docker.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
- image: "alpine:3.23"
3131
with_gui: false # it appears FindQt6.cmake is not provided by any package
3232
full_build: false # FIXME: test-signalhandler.cpp fails to build since feenableexcept() is missing
33+
- image: "oraclelinux:8"
34+
with_gui: false # TODO
35+
full_build: false # TODO
3336
fail-fast: false # Prefer quick result
3437

3538
runs-on: ubuntu-22.04
@@ -63,6 +66,12 @@ jobs:
6366
run: |
6467
apk add cmake make g++ pcre-dev
6568
69+
- name: Install missing software on Oracle Linux
70+
if: contains(matrix.image, 'oraclelinux')
71+
run: |
72+
yum install -y git python3 which epel-release
73+
yum install -y cmake make g++ pcre-dev
74+
6675
# needs to be called after the package installation since
6776
# - it doesn't call "apt-get update"
6877
- name: ccache
@@ -87,7 +96,7 @@ jobs:
8796

8897
strategy:
8998
matrix:
90-
image: ["ubuntu:24.04", "ubuntu:25.10", "alpine:3.23"]
99+
image: ["ubuntu:24.04", "ubuntu:25.10", "alpine:3.23", "oraclelinux:8"]
91100
fail-fast: false # Prefer quick result
92101

93102
runs-on: ubuntu-22.04
@@ -111,6 +120,12 @@ jobs:
111120
run: |
112121
apk add make g++ pcre-dev bash python3 libxml2-utils
113122
123+
- name: Install missing software on Oracle Linux
124+
if: contains(matrix.image, 'oraclelinux')
125+
run: |
126+
yum install -y git python3 which epel-release
127+
yum install -y cmake make g++ pcre-dev
128+
114129
# needs to be called after the package installation since
115130
# - it doesn't call "apt-get update"
116131
- name: ccache

lib/settings.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ Settings::~Settings() = default;
7979
Settings::Settings(const Settings&) = default;
8080
Settings & Settings::operator=(const Settings &) = default;
8181

82-
Settings::Settings(Settings&&) noexcept = default;
83-
Settings & Settings::operator=(Settings &&) noexcept = default;
84-
8582
std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug)
8683
{
8784
static const std::string cfgFilename = "cppcheck.cfg";

lib/settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
113113
Settings(const Settings&);
114114
Settings& operator=(const Settings&);
115115

116-
Settings(Settings&&) noexcept;
117-
Settings& operator=(Settings&&) noexcept;
116+
Settings(Settings&&) noexcept = default;
117+
Settings& operator=(Settings&&) noexcept = default;
118118

119119
static std::string loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug = false);
120120

0 commit comments

Comments
 (0)