Skip to content

[v6.38] Fix an upcoming error for v6.38#20290

Merged
hageboeck merged 1 commit intoroot-project:v6-38-00-patchesfrom
hageboeck:revert_deprecated_functions_v6.38
Nov 6, 2025
Merged

[v6.38] Fix an upcoming error for v6.38#20290
hageboeck merged 1 commit intoroot-project:v6-38-00-patchesfrom
hageboeck:revert_deprecated_functions_v6.38

Conversation

@hageboeck
Copy link
Member

@hageboeck hageboeck commented Nov 5, 2025

The TGLWSIncludes.h header is being removed from the public interface
in v6.40. Due to using >= 6.38, it will cause a compiler error already
when the version number is incremented to 6.38, where it was supposed to raise only a warning.

Here, the version number is corrected, and the error message is written for users instead of ROOT developers.
On Windows, the unsupported #warning is suppressed.

@hageboeck hageboeck self-assigned this Nov 5, 2025
@hageboeck hageboeck added the clean build Ask CI to do non-incremental build on PR label Nov 5, 2025
@github-actions
Copy link

github-actions bot commented Nov 5, 2025

Test Results

    22 files      22 suites   4d 3h 40m 28s ⏱️
 3 705 tests  3 705 ✅ 0 💤 0 ❌
79 556 runs  79 556 ✅ 0 💤 0 ❌

Results for commit a0e4ba5.

♻️ This comment has been updated with latest results.

@hahnjo
Copy link
Member

hahnjo commented Nov 5, 2025

Maybe it would be better to force-push the branch, actually removing the two commits?

@hageboeck hageboeck force-pushed the revert_deprecated_functions_v6.38 branch from 9e57ff2 to 3d82edf Compare November 5, 2025 13:41
@hageboeck
Copy link
Member Author

hageboeck commented Nov 5, 2025

Maybe it would be better to force-push the branch, actually removing the two commits?

I would like to do that, but I will confirm with Danilo once he's back if it's OK.
Edit: Done now

@hageboeck hageboeck force-pushed the revert_deprecated_functions_v6.38 branch from 3d82edf to dfb4a95 Compare November 5, 2025 15:44
@hageboeck hageboeck changed the title [v6.38] Test re-adding functions to be removed in v6.40 [v6.38] Fix an upcoming error for v6.38 Nov 5, 2025
The TGLWSIncludes.h header is being removed from the public interface
in v6.40. Due to using >= 6.38, it was causing a compiler error already
in v6.38, where it was supposed to raise only a warning.

Here, the version number is corrected, and the error message is written
for users instead of ROOT developers.
On Windows, the unsupported #warning is suppressed.
@hageboeck hageboeck force-pushed the revert_deprecated_functions_v6.38 branch from dfb4a95 to a0e4ba5 Compare November 5, 2025 15:50
@hageboeck hageboeck requested a review from guitargeek November 5, 2025 16:18
@hageboeck hageboeck marked this pull request as ready for review November 5, 2025 16:44
@hageboeck hageboeck requested a review from couet as a code owner November 5, 2025 16:44
@hageboeck hageboeck requested a review from dpiparo November 5, 2025 16:44
@hageboeck hageboeck merged commit a3828be into root-project:v6-38-00-patches Nov 6, 2025
49 of 50 checks passed
@hageboeck hageboeck deleted the revert_deprecated_functions_v6.38 branch November 6, 2025 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clean build Ask CI to do non-incremental build on PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants