Skip to content

Fix compilation under Clang #1073

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
kennykerr merged 2 commits into from
Dec 8, 2021
Merged

Fix compilation under Clang #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f6efd
Fix compilation under Clang
sylveon Dec 5, 2021
6592bba
Keep normal auto
sylveon Dec 5, 2021
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
3 changes: 2 additions & 1 deletion cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3259,6 +3259,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
w.write(strings::base_reference_produce);
w.write(strings::base_deferral);
w.write(strings::base_coroutine_foundation);
w.write(strings::base_stringable_format);
}
else if (namespace_name == "Windows.Foundation.Collections")
{
Expand Down Expand Up @@ -3295,7 +3296,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
if (namespace_name == "Windows.Foundation")
{
w.write(strings::base_reference_produce_1);
w.write(strings::base_stringable_format);
w.write(strings::base_stringable_format_1);
}
}
}
3 changes: 2 additions & 1 deletion cppwinrt/cppwinrt.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@
<ClInclude Include="..\strings\base_security.h" />
<ClInclude Include="..\strings\base_std_hash.h" />
<ClInclude Include="..\strings\base_string.h" />
<ClInclude Include="..\strings\base_stringable_format.h" />
<ClInclude Include="..\strings\base_string_input.h" />
<ClInclude Include="..\strings\base_string_operators.h" />
<ClInclude Include="..\strings\base_stringable_format.h" />
<ClInclude Include="..\strings\base_stringable_format_1.h" />
<ClInclude Include="..\strings\base_types.h" />
<ClInclude Include="..\strings\base_version.h" />
<ClInclude Include="..\strings\base_version_odr.h" />
Expand Down
3 changes: 3 additions & 0 deletions cppwinrt/cppwinrt.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@
<ClInclude Include="..\strings\base_iterator.h">
<Filter>strings</Filter>
</ClInclude>
<ClInclude Include="..\strings\base_stringable_format_1.h">
<Filter>strings</Filter>
</ClInclude>
<ClInclude Include="..\strings\base_stringable_format.h">
<Filter>strings</Filter>
</ClInclude>
Expand Down
12 changes: 4 additions & 8 deletions strings/base_stringable_format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@

#ifdef __cpp_lib_format
template<>
struct std::formatter<winrt::Windows::Foundation::IStringable, wchar_t> : std::formatter<winrt::hstring, wchar_t>
template <typename FormatContext>
auto std::formatter<winrt::Windows::Foundation::IStringable, wchar_t>::format(winrt::Windows::Foundation::IStringable const& obj, FormatContext& fc)
{
template<typename FormatContext>
auto format(winrt::Windows::Foundation::IStringable const& obj, FormatContext& fc)
{
return std::formatter<winrt::hstring, wchar_t>::format(obj.ToString(), fc);
}
};
return std::formatter<winrt::hstring, wchar_t>::format(obj.ToString(), fc);
}
#endif
9 changes: 9 additions & 0 deletions strings/base_stringable_format_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

#ifdef __cpp_lib_format
template <>
struct std::formatter<winrt::Windows::Foundation::IStringable, wchar_t> : std::formatter<winrt::hstring, wchar_t>
{
template <typename FormatContext>
auto format(winrt::Windows::Foundation::IStringable const& obj, FormatContext& fc);
};
#endif