Skip to content

Fix edge case in nested Windows namespace #1004

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 1 commit into from
Aug 25, 2021
Merged

Fix edge case in nested Windows namespace #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2426,10 +2426,10 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
w.write(format, bind<write_generic_typenames>(generics));
}

auto format = R"( struct % : Windows::Foundation::IUnknown
auto format = R"( struct % : winrt::Windows::Foundation::IUnknown
{%
%(std::nullptr_t = nullptr) noexcept {}
%(void* ptr, take_ownership_from_abi_t) noexcept : Windows::Foundation::IUnknown(ptr, take_ownership_from_abi) {}
%(void* ptr, take_ownership_from_abi_t) noexcept : winrt::Windows::Foundation::IUnknown(ptr, take_ownership_from_abi) {}
template <typename L> %(L lambda);
template <typename F> %(F* function);
template <typename O, typename M> %(O* object, M method);
Expand Down
2 changes: 2 additions & 0 deletions test/test_component/test_component.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,5 +293,7 @@ namespace test_component
static void StaticMethod(Struct param);
void Method(Windows.Foundation.Uri param);
}

delegate void Delegate();
}
}