Skip to content

to_hstring for IStringable #1271

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 4 commits into from
Feb 20, 2023
Merged

to_hstring for IStringable #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d9378a
to_hstring for IStringable
jaigak Feb 7, 2023
920eb0e
Merge branch 'microsoft:master' into master
jaigak Feb 19, 2023
d113c73
Add unit test for to_hstring(IStringable const&)
jaigak Feb 19, 2023
9259d41
Use spaces in base_stringable_to_hstring.h
jaigak Feb 19, 2023
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
1 change: 1 addition & 0 deletions cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3253,6 +3253,7 @@ struct WINRT_IMPL_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_to_hstring);
w.write(strings::base_stringable_format);
w.write(strings::base_stringable_streams);
}
Expand Down
1 change: 1 addition & 0 deletions cppwinrt/cppwinrt.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<ClInclude Include="..\strings\base_string.h" />
<ClInclude Include="..\strings\base_stringable_format.h" />
<ClInclude Include="..\strings\base_stringable_streams.h" />
<ClInclude Include="..\strings\base_stringable_to_hstring.h" />
<ClInclude Include="..\strings\base_string_input.h" />
<ClInclude Include="..\strings\base_string_operators.h" />
<ClInclude Include="..\strings\base_stringable_format_1.h" />
Expand Down
5 changes: 4 additions & 1 deletion cppwinrt/cppwinrt.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<ClInclude Include="..\strings\base_stringable_format.h">
<Filter>strings</Filter>
</ClInclude>
<ClInclude Include="..\strings\base_stringable_streams.h">
<ClInclude Include="..\strings\base_stringable_streams.h">
<Filter>strings</Filter>
</ClInclude>
<ClInclude Include="..\strings\base_xaml_component_connector.h">
Expand All @@ -184,6 +184,9 @@
<ClInclude Include="..\strings\base_xaml_component_connector_winui.h">
<Filter>strings</Filter>
</ClInclude>
<ClInclude Include="..\strings\base_stringable_to_hstring.h">
<Filter>strings</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="$(OutDir)version.rc" />
Expand Down
8 changes: 8 additions & 0 deletions strings/base_stringable_to_hstring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

WINRT_EXPORT namespace winrt
{
inline hstring to_hstring(Windows::Foundation::IStringable const& stringable)
{
return stringable.ToString();
}
}
12 changes: 12 additions & 0 deletions test/old_tests/UnitTests/to_hstring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

using namespace winrt;

struct stringable : winrt::implements<stringable, winrt::Windows::Foundation::IStringable>
{
winrt::hstring ToString()
{
return L"a stringable object";
}
};

namespace
{
void test_cases()
Expand Down Expand Up @@ -82,6 +90,10 @@ namespace
hstring const c = to_hstring(b);
REQUIRE(a == c);
}
{
auto const obj = make<stringable>();
REQUIRE(to_hstring(obj) == obj.ToString());
}
}
}

Expand Down