Skip to content

[geom][mini] Disabling (temporarily) c++20 [[unlikely]] compiler hint. #17413

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
agheata merged 2 commits into from
Jan 20, 2025
Merged

[geom][mini] Disabling (temporarily) c++20 [[unlikely]] compiler hint. #17413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42816fd
[geom] Ignoring c++20 attributes when compiling bvh.h
agheata Jan 13, 2025
0edf4b4
[geom] Ignore c++-20 attributes warning on Windows.
agheata Jan 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
20 changes: 15 additions & 5 deletions geom/geom/src/TGeoParallelWorld.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,16 @@ method.
#include <mutex>

// this is for the bvh acceleration stuff
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#if defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wall"
# pragma GCC diagnostic ignored "-Wshadow"
# pragma GCC diagnostic ignored "-Wunknown-pragmas"
# pragma GCC diagnostic ignored "-Wattributes"
#elif defined (_MSC_VER)
# pragma warning( push )
# pragma warning( disable : 5051)
#endif

// V2 BVH
#include <bvh/v2/bvh.h>
Expand Down Expand Up @@ -1485,4 +1491,8 @@ void TGeoParallelWorld::TestVoxelGrid()
}
}

#pragma GCC diagnostic pop
#if defined(__GNUC__)
# pragma GCC diagnostic pop
#elif defined (_MSC_VER)
# pragma warning( pop )
#endif