Fix Windows compatibility issues - #336
Open
GagaLP wants to merge 1 commit into
Open
Conversation
…flag, no_unique_address...
|
Check-perf-impact results: (ae6918621b46271c2f10d6eb978fe95d) ❓ No new benchmark data submitted. ❓ |
PeterTh
requested changes
Jul 30, 2026
Comment on lines
+9
to
+18
| #ifdef _WIN32 | ||
| // Prevent Windows headers from polluting global namespace with min/max macros. | ||
| #ifndef NOMINMAX | ||
| #define NOMINMAX | ||
| #endif | ||
| #ifndef WIN32_LEAN_AND_MEAN | ||
| #define WIN32_LEAN_AND_MEAN | ||
| #endif | ||
| #endif | ||
|
|
Contributor
There was a problem hiding this comment.
This is generally a good idea, but usually done right before windows.h is included. Is there a reason why it is in this particular spot?
| std::vector<sycl::queue> queues; | ||
| std::optional<detail::thread_queue> submission_thread; | ||
| std::atomic_flag active_async_error_check = false; | ||
| std::atomic_flag active_async_error_check; // since c++20 atomic_flag is set to clear by default (false) |
| std::string get_simplified_type_name_from_pointer(const std::type_info& pointer_type_info) { | ||
| #if !defined(_MSC_VER) | ||
| // This type of demangling can be done if the abi header is available. This also works for Clang on Windows, if | ||
| // compiled with Itanium ABI on Windows (e.g. MinGW/MSYS2). MSVC |
| // get rid of the pointer "*" | ||
| if(!demangled_type_name.empty() && demangled_type_name.back() == '*') { demangled_type_name.pop_back(); } | ||
| #else | ||
| std::string demangled_type_name = msvc_undecorate_type_name(pointer_type_info.name()); |
Contributor
There was a problem hiding this comment.
this kind of assumes that anything not fulfilling __has_include(<cxxabi.h>) is necessarily MSVC. That's probably not unlikely in practice, but I'd prefer an additional check (and maybe error out in the final else).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR addresses a collection of smaller fixes to get Celerity working on Windows.
The most notable changes are:
[[msvc::no_unique_address]]attribute.