Skip to content

Conversation

jcfr
Copy link
Contributor

@jcfr jcfr commented Aug 30, 2025

This pull request updates simplecpp to the latest upstream master commit (danmar/simplecpp@37fa4f4) from the previous master (danmar/simplecpp@538c5c4).

Additionally, the pointer-based legacy API has been explicitly toggled by defining SIMPLECPP_TOKENLIST_ALLOW_PTR to maintain compatibility with PythonQt.

Note

Note that the PythonQt-specific patch do_not_stop_on_error.patch has also been updated to apply cleanly

Important

This will then allow us to follow-up with another update backporting the support for framework introduced upstream through pull request:


Upstream: danmar/simplecpp@37fa4f4
Source date: 2025-08-30
Files:

generator/simplecpp/simplecpp.h
generator/simplecpp/simplecpp.cpp

Patch: generator/simplecpp/do_not_stop_on_error.patch re-applied

Compare: danmar/simplecpp@538c5c4...37fa4f4


List of simplecpp changes:

$ git shortlog 538c5c4..37fa4f4 --no-merges 
Daniel Marjamäki (1):
      Switch to uncrustify (PR-517)

Jean-Christophe Fillion-Robin (4):
      chore: Improve runformat script and integrate CI checks (PR-520)
      chore: Improve attribution by ignoring bulk formatting (PR-518)
      tests: Fix execution of testrunner for out-of-source builds (PR-510)
      Improve test runner script with refactoring and prerequisite checks (PR-509)

Oliver Stöneberg (7):
      fixed #476 - fixed MSYS2 compilation with MSYS msystem (PR-513)
      CI-unixish.yml: cleaned up prerequisites for `macos-*` (PR-519)
      fixed #500 - added callgrind step to CI (PR-501)
      fixed some `Variable copied when it could be moved` Coverity warnings (PR-495)
      added `TokenList` constructors with modern buffer wrappers and hide "unsafe" ones - if available (PR-496)
      simplecpp.h: fixed formatting (PR-522)
      do not use stream to read file in `FileDataCache::tryload()` (PR-523)

…ream changes

This commit updates simplecpp patch `do_not_stop_on_error.patch` to account
for upstream changes introduced through the commit danmar/simplecpp@3911fdd ("fixed some `Variable copied when it could be moved` Coverity warnings (#495)", 2025-08-29)
@jcfr jcfr changed the title vendor(simplecpp): Update simplecpp.{h,cpp} to master (37fa4f4); was master (538c5c4)Update simplecpp to latest vendor(simplecpp): Update simplecpp.{h,cpp} to master (37fa4f4); was master (538c5c4) Aug 30, 2025
…master (538c5c4)

Explicitly toggles the pointer-based legacy API by defining
SIMPLECPP_TOKENLIST_ALLOW_PTR. This update also includes reapplying
the `do_not_stop_on_error.patch`.

---

Upstream: danmar/simplecpp@37fa4f4
Source date: 2025-08-30
Files:   generator/simplecpp/simplecpp.h, generator/simplecpp/simplecpp.cpp
Patch:   generator/simplecpp/do_not_stop_on_error.patch re-applied

Compare: danmar/simplecpp@538c5c4...37fa4f4
@jcfr jcfr force-pushed the update-simplecpp-to-latest branch from fe13fed to b2ed9c2 Compare August 30, 2025 22:50
Copy link
Contributor

@mrbean-bremen mrbean-bremen left a comment

Choose a reason for hiding this comment

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

Thanks! As far as I can see, this is mostly about modernizing the code / better support for modern compilers / preparing better macOS support, and there are no real changes in the functionality concerning PythonQt usage.
Still would have @usiems to have a look, as he has introduced the usage of simplecpp.

@usiems usiems merged commit 333b355 into MeVisLab:master Sep 1, 2025
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants