Skip to content

Commit a0e4ba5

Browse files
committed
[graf3d] Fix errors and warnings due to TGLWSIncludes.h
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.
1 parent 025a098 commit a0e4ba5

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

graf3d/gl/inc/TGLWSIncludes.h

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,11 @@
1818

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

3427
#include "RConfigure.h"
3528
#include "TGLIncludes.h"

0 commit comments

Comments
 (0)