Skip to content

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

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
hageboeck merged 1 commit into from
Nov 6, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions graf3d/gl/inc/TGLWSIncludes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,11 @@

// This header is deprecated according to
// https://its.cern.ch/jira/browse/ROOT-9807
// In the 6.38 release, our users will get a warning, and then in 6.40 we
// remove this header. Conditional on the ROOT version, this header will give
// an error on inclusion to remind us to move it. Remove also the
// _ROOT_GL_BUILDS_ITSELF definition from the CMakeLists.txt then.
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 38, 00)
#error "Header should be moved outside of the public ROOT interface now"
#else
#ifndef _ROOT_GL_BUILDS_ITSELF
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 39, 00)
#error "The TGLWSIncludes.h header was removed from ROOT in v6.40"
#elif !defined(_ROOT_GL_BUILDS_ITSELF) and !defined(_WIN32)
#warning "The TGLWSIncludes.h header is deprecated and will be removed in ROOT 6.40"
#endif
#endif


#include "RConfigure.h"
#include "TGLIncludes.h"
Expand Down
Loading