Skip to content

fixed #14267 - fixed compilation with C++17 / use simplecpp::View#7962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firewave merged 5 commits into from
Dec 29, 2025
Merged

fixed #14267 - fixed compilation with C++17 / use simplecpp::View#7962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4a758c
fixed #14267 - fixed compilation with C++17
firewave Nov 13, 2025
f3dd40c
use `simplecpp::View` / adjusted some interfaces
firewave Dec 8, 2025
bab50a5
cxx11.cmake: bail out when required c++ standard is not satisfied
firewave Dec 12, 2025
1762d0d
CI-unixish.yml: added step to build with newer C++ standards
firewave Dec 12, 2025
0cd473e
CI-windows.yml: added job to build with newer C++ standards
firewave Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .github/workflows/CI-unixish.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,6 +191,60 @@ jobs:
run: |
cmake -S . -B cmake.output_nocli_nogui -G "Unix Makefiles" -DBUILD_GUI=Off

build_cmake_cxxstd:

strategy:
matrix:
os: [ubuntu-22.04, macos-15]
cxxstd: [14, 17]
fail-fast: false # Prefer quick result

runs-on: ${{ matrix.os }}

env:
# TODO: figure out why there are cache misses with PCH enabled
CCACHE_SLOPPINESS: pch_defines,time_macros

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.cxxstd }}

- name: Install missing software on ubuntu
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install libxml2-utils
# qt6-tools-dev-tools for lprodump
# qt6-l10n-tools for lupdate
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev

# coreutils contains "nproc"
- name: Install missing software on macos
if: contains(matrix.os, 'macos')
run: |
# pcre was removed from runner images in November 2022
brew install coreutils qt@6 pcre

- name: Run CMake on ubuntu (with GUI)
if: contains(matrix.os, 'ubuntu')
run: |
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache

- name: Run CMake on macos (with GUI)
if: contains(matrix.os, 'macos')
run: |
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6

- name: Run CMake build
run: |
cmake --build cmake.output -- -j$(nproc)

build_uchar:

strategy:
Expand Down
31 changes: 27 additions & 4 deletions .github/workflows/CI-windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,6 @@ defaults:
run:
shell: cmd

# TODO: choose/add a step to bail out on compiler warnings (maybe even the release build)

jobs:

build_qt:
Expand DownExpand Up@@ -73,6 +71,33 @@ jobs:
run: |
cmake --build build --target install

build_cmake_cxxstd:
strategy:
matrix:
os: [windows-2022, windows-2025]
cxxstd: [14, 17]
fail-fast: false

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up Visual Studio environment
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64

- name: Run CMake
run: |
cmake -S . -B build.cxxstd -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!

- name: Build
run: |
cmake --build build.cxxstd --config Debug || exit /b !errorlevel!

build:
strategy:
matrix:
Expand DownExpand Up@@ -142,8 +167,6 @@ jobs:
python -m pip install pytest-xdist || exit /b !errorlevel!
python -m pip install psutil || exit /b !errorlevel!

# TODO: build with CMake

- name: Build CLI debug configuration using MSBuild
if: matrix.config == 'debug'
run: |
Expand Down
6 changes: 6 additions & 0 deletions cmake/cxx11.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
macro(use_cxx11)
if(CMAKE_CXX_STANDARD EQUAL 98)
message(FATAL_ERROR "C++ standard was set to ${CMAKE_CXX_STANDARD} but 11 is required as minimum")
endif()
if(USE_BOOST AND USE_BOOST_INT128)
# Boost.Math requires C++14
if(CMAKE_CXX_STANDARD LESS 14)
message(FATAL_ERROR "C++ standard was set to ${CMAKE_CXX_STANDARD} but 14 is required as minimum")

@pfultz2pfultz2Dec 17, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work if CMAKE_CXX_STANDARD is set to an empty string?

It would be better to check the C++ version using a compile check rather than relying on cmake variable as the compiler could support the C++ version by default.

Its also common to set it to an empty string and set the C++ version using CMAKE_CXX_FLAGS for a couple of reasons:

  • This makes sure it will use the same C++ version for the entire build as cmake changes the C++ version which can cause ABI issues
  • It can use a newer version of C++ that cmake doesnt support yet.

@firewavefirewaveDec 17, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work if CMAKE_CXX_STANDARD is set to an empty string?

Will check.

But this doesn't change any behavior (which has been around for years) it just makes sure that you don't set it something unsupported.

It would be better to check the C++ version using a compile check rather than relying on cmake variable as the compiler could support the C++ version by default.

Actually that would be worse as we do not have a file which is included into every file so you might have compile failure before that check is ever reached. And having it in every (including tools etc.) file would require an additional check in the CI and would be rather noisy and require dependencies we didn't have before.

I also find it better to bail out as early as possible.

@firewavefirewaveDec 17, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work if CMAKE_CXX_STANDARD is set to an empty string?

Will check.

It is not possible to set this is an empty string. CMake will completely bail out on that:

$ cmake -S . -B cmake.output.cxxstd -DCMAKE_CXX_STANDARD=""
[...]
-- CMake C++ Standard = [...]
CMake Error in externals/tinyxml2/CMakeLists.txt:
Target "tinyxml2" requires the language dialect "CXX" . But the current
compiler "GNU" does not support this, or CMake does not know the flags to
enable it.

The last error is shown for every target which generates an output.

@firewavefirewaveDec 17, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will make this ready for review as I do not see anything else to do.

endif()
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to use")
else()
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
Expand Down
2 changes: 1 addition & 1 deletion democlient/democlient.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ class CppcheckExecutor : public ErrorLogger {
{}

void run(const char* code) {
cppcheck.checkBuffer(FileWithDetails("test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const uint8_t*>(code), strlen(code));
cppcheck.checkBuffer(FileWithDetails("test.cpp", Standards::Language::CPP, 0), code, strlen(code));
}

void reportOut(const std::string & /*outmsg*/, Color /*c*/) override {}
Expand Down
2 changes: 1 addition & 1 deletion gui/mainwindow.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -736,7 +736,7 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)
{
const std::string code_s = code.toStdString();
// TODO: apply enforcedLanguage?
cppcheck.checkBuffer(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), reinterpret_cast<const std::uint8_t*>(code_s.data()), code_s.size());
cppcheck.checkBuffer(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), code_s.data(), code_s.size());
}
analysisDone();

Expand Down
6 changes: 3 additions & 3 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ unsigned int CppCheck::check(const FileWithDetails &file)
return returnValue;
}

unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const uint8_t* data, std::size_t size)
unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const char* data, std::size_t size)
{
return checkBuffer(file, "", 0, data, size);
}
Expand DownExpand Up@@ -874,10 +874,10 @@ std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const std:
return preprocessor.calculateHash(toolinfo.str());
}

unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const std::string &cfgname, int fileIndex, const uint8_t* data, std::size_t size)
unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const std::string &cfgname, int fileIndex, const char* data, std::size_t size)
{
const auto f = [&file, data, size](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
return simplecpp::TokenList{data, size, files, file.spath(), outputList};
return simplecpp::TokenList{{data, size}, files, file.spath(), outputList};
};
return checkInternal(file, cfgname, fileIndex, f);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/cppcheck.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ class CPPCHECKLIB CppCheck {
* @note You must set settings before calling this function (by calling
* settings()).
*/
unsigned int checkBuffer(const FileWithDetails &file, const uint8_t* data, std::size_t size);
unsigned int checkBuffer(const FileWithDetails &file, const char* data, std::size_t size);

/**
* @brief Returns current version number as a string.
Expand DownExpand Up@@ -194,7 +194,7 @@ class CPPCHECKLIB CppCheck {
* @param size the size of the data to be read
* @return number of errors found
*/
unsigned int checkBuffer(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const uint8_t* data, std::size_t size);
unsigned int checkBuffer(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const char* data, std::size_t size);

// TODO: should use simplecpp::OutputList
using CreateTokenListFn = std::function<simplecpp::TokenList (std::vector<std::string>&, std::list<simplecpp::Output>*)>;
Expand Down
13 changes: 9 additions & 4 deletions lib/tokenlist.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -321,17 +321,17 @@ void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)

//---------------------------------------------------------------------------

bool TokenList::createTokensFromBuffer(const uint8_t* data, size_t size)
bool TokenList::createTokensFromBuffer(const char* data, size_t size)
{
return createTokensFromBufferInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());
}

//---------------------------------------------------------------------------

bool TokenList::createTokensFromBufferInternal(const uint8_t* data, size_t size, const std::string& file0)
bool TokenList::createTokensFromBufferInternal(const char* data, size_t size, const std::string& file0)
{
simplecpp::OutputList outputList;
simplecpp::TokenList tokens(data, size, mFiles, file0, &outputList);
simplecpp::TokenList tokens({data, size}, mFiles, file0, &outputList);

createTokens(std::move(tokens));

Expand DownExpand Up@@ -1868,7 +1868,12 @@ namespace {

~OnException() {
#ifndef _MSC_VER
if (std::uncaught_exception())
#if defined(__cpp_lib_uncaught_exceptions)
const bool b = std::uncaught_exceptions() > 0;
#else
const bool b = std::uncaught_exception();
#endif
Comment on lines +1873 to +1875

@firewavefirewaveNov 13, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was deprecated in C++17.

if (b)
f();
#endif
}
Expand Down
10 changes: 5 additions & 5 deletions lib/tokenlist.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,14 +99,14 @@ class CPPCHECKLIB TokenList {
* - UTF in the code are not handled.
* - comments are not handled.
*/
bool createTokensFromBuffer(const uint8_t* data, size_t size);
bool createTokensFromBuffer(const char* data, size_t size) {
return createTokensFromBuffer(reinterpret_cast<const uint8_t*>(data), size);
bool createTokensFromBuffer(const uint8_t* data, size_t size) {
return createTokensFromBuffer(reinterpret_cast<const char*>(data), size);
}
bool createTokensFromBuffer(const char* data, size_t size);
template<size_t size>
// cppcheck-suppress unusedFunction - used in tests only
bool createTokensFromString(const char (&data)[size]) {
return createTokensFromBuffer(reinterpret_cast<const uint8_t*>(data), size-1);
return createTokensFromBuffer(data, size-1);
}

void createTokens(simplecpp::TokenList&& tokenList);
Expand DownExpand Up@@ -216,7 +216,7 @@ class CPPCHECKLIB TokenList {
}

private:
bool createTokensFromBufferInternal(const uint8_t* data, std::size_t size, const std::string& file0);
bool createTokensFromBufferInternal(const char* data, std::size_t size, const std::string& file0);

/** Token list */
std::shared_ptr<TokensFrontBack> mTokensFrontBack;
Expand Down
2 changes: 1 addition & 1 deletion oss-fuzz/main.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ static void doCheck(const uint8_t *data, size_t dataSize)
{
Suppressions supprs;
CppCheck cppcheck(s_settings, supprs, s_errorLogger, false, nullptr);
cppcheck.checkBuffer(s_file, data, dataSize);
cppcheck.checkBuffer(s_file, reinterpret_cast<const char*>(data), dataSize);
}

#ifndef NO_FUZZ
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ ScopedFile::~ScopedFile() {
void SimpleTokenizer2::preprocess(const char* code, std::size_t size, std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger)
{
simplecpp::OutputList outputList;
simplecpp::TokenList tokens1(code, size, files, file0, &outputList);
simplecpp::TokenList tokens1({code, size}, files, file0, &outputList);

Preprocessor preprocessor(tokens1, tokenizer.getSettings(), errorlogger, Path::identify(tokens1.getFiles()[0], false));
(void)preprocessor.loadFiles(files); // TODO: check result
Expand Down
9 changes: 4 additions & 5 deletions test/testpreprocessor.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,8 @@ class TestPreprocessor : public TestFixture {
simplecpp::OutputList outputList;
std::vector<std::string> files;

simplecpp::TokenList tokens(code, size, files, Path::simplifyPath(filename), &outputList);
simplecpp::TokenList tokens({code, size}, files, Path::simplifyPath(filename), &outputList);

// TODO: we should be using the actual Preprocessor implementation
Preprocessor preprocessor(tokens, settings, errorlogger, Path::identify(tokens.getFiles()[0], false));

Expand DownExpand Up@@ -372,8 +373,7 @@ class TestPreprocessor : public TestFixture {
ASSERT(settings.library.load("", library, false).errorcode == Library::ErrorCode::OK);
std::vector<std::string> files;
simplecpp::OutputList outputList;
// TODO: this adds an empty filename
simplecpp::TokenList tokens(code,files,"",&outputList);
simplecpp::TokenList tokens(code,files,"test.c",&outputList);
Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C); // TODO: do we need to consider #file?
ASSERT(preprocessor.loadFiles(files));
ASSERT(!preprocessor.reportOutput(outputList, true));
Expand All@@ -388,8 +388,7 @@ class TestPreprocessor : public TestFixture {
template<size_t size>
std::size_t getHash(const char (&code)[size]) {
std::vector<std::string> files;
// TODO: this adds an empty filename
simplecpp::TokenList tokens(code,files,"");
simplecpp::TokenList tokens(code,files,"test.c");
Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C); // TODO: do we need to consider #file?
ASSERT(preprocessor.loadFiles(files));
preprocessor.removeComments();
Expand Down
4 changes: 2 additions & 2 deletions test/testsuppressions.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1312,7 +1312,7 @@ class TestSuppressions : public TestFixture {
CppCheck cppCheck(settings, supprs, *this, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.

const char code[] = "int f() { int a; return a; }";
ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0), reinterpret_cast<const std::uint8_t*>(code), sizeof(code))); // <- no unsuppressed error is seen
ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0),code, sizeof(code))); // <- no unsuppressed error is seen
ASSERT_EQUALS("[test.c:1:25]: (error) Uninitialized variable: a [uninitvar]\n", errout_str()); // <- report error so ThreadExecutor can suppress it and make sure the global suppression is matched.
}

Expand DownExpand Up@@ -1352,7 +1352,7 @@ class TestSuppressions : public TestFixture {
" int y;\n"
"};";
CppCheck cppCheck(settings, supprs, *this, true, nullptr);
ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const std::uint8_t*>(code), sizeof(code)));
ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), code, sizeof(code)));
ASSERT_EQUALS("",errout_str());
}

Expand Down
Loading