Skip to content

Remove WINRT_IMPL_AUTO #1117

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
Mar 10, 2022
Merged

Remove WINRT_IMPL_AUTO #1117

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
16 changes: 6 additions & 10 deletions cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,9 +992,8 @@ namespace cppwinrt
auto method_name = get_name(method);
auto type = method.Parent();

w.write(" %WINRT_IMPL_AUTO(%) %(%) const%;\n",
w.write(" %auto %(%) const%;\n",
is_get_overload(method) ? "[[nodiscard]] " : "",
signature.return_signature(),
method_name,
bind<write_consume_params>(signature),
is_noexcept(method) ? " noexcept" : "");
Expand Down Expand Up @@ -1133,15 +1132,15 @@ namespace cppwinrt
if (is_remove_overload(method))
{
// we intentionally ignore errors when unregistering event handlers to be consistent with event_revoker
format = R"( template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
format = R"( template <typename D%> auto consume_%<D%>::%(%) const noexcept
{%
WINRT_IMPL_SHIM(%)->%(%);%
}
)";
}
else
{
format = R"( template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const noexcept
format = R"( template <typename D%> auto consume_%<D%>::%(%) const noexcept
{%
WINRT_VERIFY_(0, WINRT_IMPL_SHIM(%)->%(%));%
}
Expand All @@ -1150,7 +1149,7 @@ namespace cppwinrt
}
else
{
format = R"( template <typename D%> WINRT_IMPL_AUTO(%) consume_%<D%>::%(%) const
format = R"( template <typename D%> auto consume_%<D%>::%(%) const
{%
check_hresult(WINRT_IMPL_SHIM(%)->%(%));%
}
Expand All @@ -1159,7 +1158,6 @@ namespace cppwinrt

w.write(format,
bind<write_comma_generic_typenames>(generics),
signature.return_signature(),
type_impl_name,
bind<write_comma_generic_types>(generics),
method_name,
Expand Down Expand Up @@ -1207,14 +1205,13 @@ namespace cppwinrt
// return static_cast<% const&>(*this).%(%);
//

std::string_view format = R"( inline WINRT_IMPL_AUTO(%) %::%(%) const%
std::string_view format = R"( inline auto %::%(%) const%
{
return [&](% const& winrt_impl_base) { return winrt_impl_base.%(%); }(*this);
}
)";

w.write(format,
signature.return_signature(),
class_type.TypeName(),
method_name,
bind<write_consume_params>(signature),
Expand Down Expand Up @@ -1999,7 +1996,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>

static void write_interface_override_method(writer& w, MethodDef const& method, std::string_view const& interface_name)
{
auto format = R"( template <typename D> WINRT_IMPL_AUTO(%) %T<D>::%(%) const%
auto format = R"( template <typename D> auto %T<D>::%(%) const%
{
return shim().template try_as<%>().%(%);
}
Expand All @@ -2009,7 +2006,6 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
auto method_name = get_name(method);

w.write(format,
signature.return_signature(),
interface_name,
method_name,
bind<write_consume_params>(signature),
Expand Down
6 changes: 0 additions & 6 deletions strings/base_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@

#define WINRT_IMPL_SHIM(...) (*(abi_t<__VA_ARGS__>**)&static_cast<__VA_ARGS__ const&>(static_cast<D const&>(*this)))

#ifdef __INTELLISENSE__
#define WINRT_IMPL_AUTO(...) __VA_ARGS__
#else
#define WINRT_IMPL_AUTO(...) auto
#endif

// Note: this is a workaround for a false-positive warning produced by the Visual C++ 15.9 compiler.
#pragma warning(disable : 5046)

Expand Down