-
Notifications
You must be signed in to change notification settings - Fork 278
Sync with OS (part 1 of 2) #609
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.
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
base: master
Are you sure you want to change the base?
Conversation
| #pragma warning(push) | ||
| // The updated behavior of running init-list ctors during placement new is proper & correct, disable the warning that requests developers verify they want it | ||
| #pragma warning(disable : 4351) | ||
| // remove this after fixing - volatile access of '<expression>' is subject to /volatile:<iso|ms> setting; consider using __iso_volatile_load/store intrinsic functions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI @jonwis I noticed this when copying the changes
| __pragma(warning(suppress : 4297)); \ | ||
| LOG_CAUGHT_EXCEPTION(); \ | ||
| return; \ | ||
| __pragma(warning(push)) __pragma(warning(disable : 4297)) LOG_CAUGHT_EXCEPTION(); \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should update .clang-format to treat __pragma(...) as a full statement
| } | ||
|
|
||
| template <typename TSrc, std::enable_if_t<has_c_str<TSrc>::value && has_size<TSrc>::value>* = nullptr> | ||
| template <typename TSrc, std::enable_if_t<has_c_str<TSrc>::value && has_size<TSrc>::value && std::is_same_v<typename TSrc::value_type, TChar>>* = nullptr> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI @jonwis I had to make these changes to resolve ambiguous function call errors.
Related to this, there are some outstanding compilation errors with wil::str_concat when passing std::filesystem::path/winrt::hstring because both can implicitly convert to wil::basic_zstring_view and std::basic_string_view. I'm going to hold off on addressing those errors for now and do this in two parts: this part which mostly only copies source files back and forth with simple fixes and a second part where I try and tackle the wil::str_concat issue, hopefully while also fixing the two phase name lookup problem
This has been long overdue