Remove dependencies on unstable MSVC/STL extensions, #18334
Conversation
This file contains 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
…ns, and fix non-standard compliant code
YexuanXiao
commented
Dec 17, 2024
YexuanXiao
commented
Dec 17, 2024
YexuanXiao
commented
Dec 17, 2024
YexuanXiao
commented
Dec 17, 2024
YexuanXiao
commented
Dec 17, 2024
YexuanXiao
commented
Dec 17, 2024
| @@ -42,10 +42,10 @@ class ConsoleWaitBlock | |||
| _In_ IWaitRoutine* const pWaiter); | |||
|
|
|||
| ConsoleWaitQueue* const _pProcessQueue; | |||
| std::_List_const_iterator<std::_List_val<std::_List_simple_types<ConsoleWaitBlock*>>> _itProcessQueue; | |||
| typename std::list<ConsoleWaitBlock*>::const_iterator _itProcessQueue; | |||
There was a problem hiding this comment.
Remove the use of unstable STL internal names.
YexuanXiao
commented
Dec 17, 2024
| @@ -104,7 +104,7 @@ namespace Microsoft::Console::VirtualTerminal | |||
| size_t _colorsUsed = 0; | |||
| size_t _colorsAvailable = 0; | |||
| bool _colorTableChanged = false; | |||
| IndexedPixel _foregroundPixel = 0; | |||
| IndexedPixel _foregroundPixel = {}; | |||
There was a problem hiding this comment.
The struct has two members, and allowing the use of = 0 initialization might be an MSVC extension or a bug.
YexuanXiao
commented
Dec 17, 2024
| @@ -255,7 +255,7 @@ void Utils::InitializeVT340ColorTable(const std::span<COLORREF> table) noexcept | |||
| // - table: a color table to be filled | |||
| // Return Value: | |||
| // - <none> | |||
| constexpr void Utils::InitializeExtendedColorTable(const std::span<COLORREF> table, const bool monochrome) noexcept | |||
| void Utils::InitializeExtendedColorTable(const std::span<COLORREF> table, const bool monochrome) noexcept | |||
There was a problem hiding this comment.
Removed the strange constexpr as it might cause the function definition to be discarded, leading to missing symbols.
YexuanXiao
commented
Dec 17, 2024
YexuanXiao
commented
Dec 17, 2024
| @@ -567,10 +567,11 @@ void VtIo::Writer::WriteUTF16(std::wstring_view str) const | |||
|
|
|||
| // C++23's resize_and_overwrite is too valuable to not use. | |||
| // It reduce the CPU overhead by roughly half. | |||
| #if !defined(_HAS_CXX23) || !_HAS_CXX23 | |||
| #if !defined(__cpp_lib_string_resize_and_overwrite) && _MSVC_STL_UPDATE >= 202111L | |||
There was a problem hiding this comment.
Using feature test macros instead of MSVC private macros; this will no longer be necessary after upgrading to C++23. The macro _MSVC_STL_UPDATE is documented.
YexuanXiao
commented
Dec 17, 2024
| @@ -13,6 +13,7 @@ | |||
| #include <span> | |||
| #include <string_view> | |||
| #include <vector> | |||
| #include <cassert> | |||
There was a problem hiding this comment.
Code using assert but did not include the header cassert, rely on the unstable internal include relationship of STL. I think it would be better to fix it.
YexuanXiao
commented
Dec 17, 2024
| @@ -165,7 +165,7 @@ namespace Microsoft::Console::Render | |||
| // It's important the pool is first so it can be given to the others on construction. | |||
| std::pmr::unsynchronized_pool_resource _pool; | |||
| std::pmr::vector<std::pmr::wstring> _polyStrings; | |||
| std::pmr::vector<std::pmr::basic_string<int>> _polyWidths; | |||
| std::pmr::vector<std::pmr::vector<int>> _polyWidths; | |||
There was a problem hiding this comment.
Not used as string nor need the null terminator.
YexuanXiao
changed the title
lhecker
approved these changes
Dec 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
and fix non-standard compliant code
Fix some potential issues that may be exposed after upgrading the compiler and dependencies. For detailed explanations, see the comments.