Skip to content

Remove <experimental/coroutine> and add missing std qualifications #2

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
YexuanXiao merged 3 commits into from
Feb 22, 2026
Merged

Remove <experimental/coroutine> and add missing std qualifications #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b29e25e
Remove <experimental/coroutine> and add missing std qualifications
YexuanXiao Feb 22, 2026
076c2fe
More std qualifications
YexuanXiao Feb 22, 2026
fca3365
Replace std::std with std
YexuanXiao Feb 22, 2026
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 .github/ISSUE_TEMPLATE/bug_report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ body:

int main()
{
Uri uri(L"https://kennykerr.ca");
printf("%ls\n", uri.ToString().c_str());
Uri uri(L"https://github.com/yexuanXiao/cppwinrtplus");
std::printf("%ls\n", uri.ToString().c_str());
}
render: cpp
- type: textarea
Expand Down
30 changes: 15 additions & 15 deletions cppwinrt/cmd_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ namespace cppwinrt

while (true)
{
DWORD actual_size = GetModuleFileNameA(nullptr, path.data(), 1 + static_cast<uint32_t>(path.size()));
DWORD actual_size = GetModuleFileNameA(nullptr, path.data(), 1 + static_cast<std::uint32_t>(path.size()));

if (actual_size < 1 + path.size())
{
Expand Down Expand Up @@ -237,12 +237,12 @@ namespace cppwinrt
}

auto key = open_sdk();
uint32_t index{};
std::uint32_t index{};
std::array<char, 100> subkey;
std::array<unsigned long, 4> version_parts{};
std::string result;

while (0 == RegEnumKeyA(key.handle, index++, subkey.data(), static_cast<uint32_t>(subkey.size())))
while (0 == RegEnumKeyA(key.handle, index++, subkey.data(), static_cast<std::uint32_t>(subkey.size())))
{
if (!std::regex_match(subkey.data(), match, rx))
{
Expand All @@ -258,7 +258,7 @@ namespace cppwinrt
char* next_part = subkey.data();
bool force_newer = false;

for (size_t i = 0; ; ++i)
for (std::size_t i = 0; ; ++i)
{
auto version_part = strtoul(next_part, &next_part, 10);

Expand Down Expand Up @@ -312,19 +312,19 @@ namespace cppwinrt

struct option
{
static constexpr uint32_t no_min = 0;
static constexpr uint32_t no_max = UINT_MAX;
static constexpr std::uint32_t no_min = 0;
static constexpr std::uint32_t no_max = UINT_MAX;

std::string_view name;
uint32_t min{ no_min };
uint32_t max{ no_max };
std::uint32_t min{ no_min };
std::uint32_t max{ no_max };
std::string_view arg{};
std::string_view desc{};
};

struct reader
{
template <typename C, typename V, size_t numOptions>
template <typename C, typename V, std::size_t numOptions>
reader(C const argc, V const argv, const option(& options)[numOptions])
{
#ifdef _DEBUG
Expand Down Expand Up @@ -449,9 +449,9 @@ namespace cppwinrt
#if defined(_WIN32) || defined(_WIN64)
std::array<char, 260> local{};
#ifdef _WIN64
ExpandEnvironmentStringsA("%windir%\\System32\\WinMetadata", local.data(), static_cast<uint32_t>(local.size()));
ExpandEnvironmentStringsA("%windir%\\System32\\WinMetadata", local.data(), static_cast<std::uint32_t>(local.size()));
#else
ExpandEnvironmentStringsA("%windir%\\SysNative\\WinMetadata", local.data(), static_cast<uint32_t>(local.size()));
ExpandEnvironmentStringsA("%windir%\\SysNative\\WinMetadata", local.data(), static_cast<std::uint32_t>(local.size()));
#endif
add_directory(local.data());
#else /* defined(_WIN32) || defined(_WIN64) */
Expand Down Expand Up @@ -586,7 +586,7 @@ namespace cppwinrt
std::filesystem::path response_path{ std::string{ arg } };
std::string extension = response_path.extension().generic_string();
std::transform(extension.begin(), extension.end(), extension.begin(),
[](auto c) { return static_cast<unsigned char>(::tolower(c)); });
[](auto c) { return static_cast<unsigned char>(std::tolower(c)); });

// Check if misuse of @ prefix, so if directory or metadata file instead of response file.
if (is_directory(response_path) || extension == ".winmd")
Expand All @@ -597,20 +597,20 @@ namespace cppwinrt
std::ifstream response_file(absolute(response_path));
while (getline(response_file, line_buf))
{
size_t argc = 0;
std::size_t argc = 0;
std::vector<std::string> argv;

parse_command_line(line_buf.data(), argv, &argc);

for (size_t i = 0; i < argc; i++)
for (std::size_t i = 0; i < argc; i++)
{
extract_option(argv[i], options, last);
}
}
}

template <typename Character>
static void parse_command_line(Character* cmdstart, std::vector<std::string>& argv, size_t* argument_count)
static void parse_command_line(Character* cmdstart, std::vector<std::string>& argv, std::size_t* argument_count)
{

std::string arg;
Expand Down
84 changes: 42 additions & 42 deletions cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,35 +359,35 @@ namespace cppwinrt
using std::get;

w.write_printf("0x%08X,0x%04X,0x%04X,{ 0x%02X,0x%02X,0x%02X,0x%02X,0x%02X,0x%02X,0x%02X,0x%02X }",
get<uint32_t>(get<ElemSig>(args[0].value).value),
get<uint16_t>(get<ElemSig>(args[1].value).value),
get<uint16_t>(get<ElemSig>(args[2].value).value),
get<uint8_t>(get<ElemSig>(args[3].value).value),
get<uint8_t>(get<ElemSig>(args[4].value).value),
get<uint8_t>(get<ElemSig>(args[5].value).value),
get<uint8_t>(get<ElemSig>(args[6].value).value),
get<uint8_t>(get<ElemSig>(args[7].value).value),
get<uint8_t>(get<ElemSig>(args[8].value).value),
get<uint8_t>(get<ElemSig>(args[9].value).value),
get<uint8_t>(get<ElemSig>(args[10].value).value));
get<std::uint32_t>(get<ElemSig>(args[0].value).value),
get<std::uint16_t>(get<ElemSig>(args[1].value).value),
get<std::uint16_t>(get<ElemSig>(args[2].value).value),
get<std::uint8_t>(get<ElemSig>(args[3].value).value),
get<std::uint8_t>(get<ElemSig>(args[4].value).value),
get<std::uint8_t>(get<ElemSig>(args[5].value).value),
get<std::uint8_t>(get<ElemSig>(args[6].value).value),
get<std::uint8_t>(get<ElemSig>(args[7].value).value),
get<std::uint8_t>(get<ElemSig>(args[8].value).value),
get<std::uint8_t>(get<ElemSig>(args[9].value).value),
get<std::uint8_t>(get<ElemSig>(args[10].value).value));
}

static void write_guid_comment(writer& w, std::vector<FixedArgSig> const& args)
{
using std::get;

w.write_printf("%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
get<uint32_t>(get<ElemSig>(args[0].value).value),
get<uint16_t>(get<ElemSig>(args[1].value).value),
get<uint16_t>(get<ElemSig>(args[2].value).value),
get<uint8_t>(get<ElemSig>(args[3].value).value),
get<uint8_t>(get<ElemSig>(args[4].value).value),
get<uint8_t>(get<ElemSig>(args[5].value).value),
get<uint8_t>(get<ElemSig>(args[6].value).value),
get<uint8_t>(get<ElemSig>(args[7].value).value),
get<uint8_t>(get<ElemSig>(args[8].value).value),
get<uint8_t>(get<ElemSig>(args[9].value).value),
get<uint8_t>(get<ElemSig>(args[10].value).value));
get<std::uint32_t>(get<ElemSig>(args[0].value).value),
get<std::uint16_t>(get<ElemSig>(args[1].value).value),
get<std::uint16_t>(get<ElemSig>(args[2].value).value),
get<std::uint8_t>(get<ElemSig>(args[3].value).value),
get<std::uint8_t>(get<ElemSig>(args[4].value).value),
get<std::uint8_t>(get<ElemSig>(args[5].value).value),
get<std::uint8_t>(get<ElemSig>(args[6].value).value),
get<std::uint8_t>(get<ElemSig>(args[7].value).value),
get<std::uint8_t>(get<ElemSig>(args[8].value).value),
get<std::uint8_t>(get<ElemSig>(args[9].value).value),
get<std::uint8_t>(get<ElemSig>(args[10].value).value));
}

static void write_category(writer& w, TypeDef const& type, std::string_view const& category)
Expand Down Expand Up @@ -561,15 +561,15 @@ namespace cppwinrt

if (param.Flags().In())
{
format = "uint32_t%, %";
format = "std::uint32_t%, %";
}
else if (param_signature->ByRef())
{
format = "uint32_t*%, %*";
format = "std::uint32_t*%, %*";
}
else
{
format = "uint32_t%, %";
format = "std::uint32_t%, %";
}

w.write(format, bind<write_array_size_name>(param), bind<write_abi_arg_out>(param_signature->Type()));
Expand Down Expand Up @@ -605,7 +605,7 @@ namespace cppwinrt

if (type.is_szarray())
{
w.write("uint32_t* __%Size, %**", method_signature.return_param_name(), type);
w.write("std::uint32_t* __%Size, %**", method_signature.return_param_name(), type);
}
else
{
Expand Down Expand Up @@ -743,7 +743,7 @@ namespace cppwinrt
break;
}

auto format = R"( virtual int32_t __stdcall %(%) noexcept = 0;
auto format = R"( virtual std::int32_t __stdcall %(%) noexcept = 0;
)";

for (auto&& method : info.type.MethodList())
Expand Down Expand Up @@ -783,7 +783,7 @@ namespace cppwinrt
}


auto format = R"( virtual int32_t __stdcall %(%) noexcept = 0;
auto format = R"( virtual std::int32_t __stdcall %(%) noexcept = 0;
)";

auto abi_guard = w.push_abi_types(true);
Expand Down Expand Up @@ -816,7 +816,7 @@ namespace cppwinrt
{
struct WINRT_IMPL_ABI_DECL type : unknown_abi
{
virtual int32_t __stdcall Invoke(%) noexcept = 0;
virtual std::int32_t __stdcall Invoke(%) noexcept = 0;
};
};
)";
Expand Down Expand Up @@ -1049,7 +1049,7 @@ namespace cppwinrt
if (category == param_category::array_type)
{
auto format = R"(
uint32_t %_impl_size{};
std::uint32_t %_impl_size{};
%* %{};)";

auto abi_guard = w.push_abi_types(true);
Expand Down Expand Up @@ -1352,7 +1352,7 @@ namespace cppwinrt
w.write(R"(
auto data() const
{
uint8_t* data{};
std::uint8_t* data{};
static_cast<D const&>(*this).template as<IBufferByteAccess>()->Buffer(&data);
return data;
}
Expand All @@ -1363,8 +1363,8 @@ namespace cppwinrt
w.write(R"(
auto data() const
{
uint8_t* data{};
uint32_t capacity{};
std::uint8_t* data{};
std::uint32_t capacity{};
check_hresult(static_cast<D const&>(*this).template as<IMemoryBufferByteAccess>()->GetBuffer(&data, &capacity));
return data;
}
Expand Down Expand Up @@ -1515,7 +1515,7 @@ namespace cppwinrt
using iterator_concept = std::input_iterator_tag;
using iterator_category = std::input_iterator_tag;
using value_type = T;
using difference_type = ptrdiff_t;
using difference_type = std::ptrdiff_t;
using pointer = void;
using reference = T;
)");
Expand All @@ -1526,7 +1526,7 @@ namespace cppwinrt
using iterator_concept = std::input_iterator_tag;
using iterator_category = std::input_iterator_tag;
using value_type = Windows::Foundation::IInspectable;
using difference_type = ptrdiff_t;
using difference_type = std::ptrdiff_t;
using pointer = void;
using reference = Windows::Foundation::IInspectable;
)");
Expand Down Expand Up @@ -1909,7 +1909,7 @@ namespace cppwinrt

if (is_noexcept(method))
{
format = R"( int32_t __stdcall %(%) noexcept final
format = R"( std::int32_t __stdcall %(%) noexcept final
{
% typename D::abi_guard guard(this->shim());
%
Expand All @@ -1919,7 +1919,7 @@ namespace cppwinrt
}
else
{
format = R"( int32_t __stdcall %(%) noexcept final try
format = R"( std::int32_t __stdcall %(%) noexcept final try
{
% typename D::abi_guard guard(this->shim());
%
Expand All @@ -1941,7 +1941,7 @@ namespace cppwinrt
{
// Special-case IMap*::Lookup to look for a TryLookup here, to avoid extranous throw/originates
std::string tryLookupUpCall = "this->shim().TryLookup";
format = R"( int32_t __stdcall %(%) noexcept final try
format = R"( std::int32_t __stdcall %(%) noexcept final try
{
% typename D::abi_guard guard(this->shim());
if constexpr (has_TryLookup_v<D, K>)
Expand Down Expand Up @@ -2631,7 +2631,7 @@ struct WINRT_IMPL_EMPTY_BASES produce_dispatch_to_overridable<T, D, %>
{
delegate(H&& handler) : implements_delegate<%, H>(std::forward<H>(handler)) {}

int32_t __stdcall Invoke(%) noexcept final try
std::int32_t __stdcall Invoke(%) noexcept final try
{
% %
return 0;
Expand Down Expand Up @@ -2836,7 +2836,7 @@ struct WINRT_IMPL_EMPTY_BASES produce_dispatch_to_overridable<T, D, %>

static void write_struct_equality(writer& w, std::vector<std::pair<std::string_view, std::string>> const& fields)
{
for (size_t i = 0; i != fields.size(); ++i)
for (std::size_t i = 0; i != fields.size(); ++i)
{
w.write(" left.% == right.%", fields[i].first, fields[i].first);

Expand Down Expand Up @@ -2912,9 +2912,9 @@ struct WINRT_IMPL_EMPTY_BASES produce_dispatch_to_overridable<T, D, %>
return false;
};

for (size_t left = 0; left < structs.size(); ++left)
for (std::size_t left = 0; left < structs.size(); ++left)
{
for (size_t right = left + 1; right < structs.size(); ++right)
for (std::size_t right = left + 1; right < structs.size(); ++right)
{
if (depends(w, structs[left], structs[right]))
{
Expand Down
Loading