Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<package id="Microsoft.WSL.Dependencies.arm64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
<package id="Microsoft.WSL.DeviceHost" version="1.2.48-0" />
<package id="Microsoft.WSL.Kernel" version="6.18.35.2-1" targetFramework="native" />
<package id="Microsoft.WSL.LinuxSdk" version="1.20.0" targetFramework="native" />
<package id="Microsoft.WSL.LinuxSdk" version="1.23.0" targetFramework="native" />
<package id="Microsoft.WSL.TestData" version="0.5.0" />
<package id="Microsoft.WSL.TestDistro" version="2.7.1-1" />
<package id="Microsoft.WSLg" version="1.0.79" />
Expand Down
7 changes: 7 additions & 0 deletions src/shared/inc/stringshared.h
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,11 @@ struct std::formatter<std::source_location, wchar_t>
}
};

// char -> wchar_t formatting is only used by the Windows components. libc++ (used to

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sad to learn about this, but I guess this will be a problem for later

// build the Linux components) now provides these as deleted specializations per C++23
// [format.formatter.spec], which would collide, so restrict them to Windows.
#ifdef WIN32

template <>
struct std::formatter<char*, wchar_t>
{
Expand Down Expand Up @@ -995,6 +1000,8 @@ struct std::formatter<std::basic_string<char, Traits, Allocator>, wchar_t>
}
};

#endif // WIN32

template <>
struct std::formatter<std::filesystem::path, wchar_t>
{
Expand Down