Skip to content

<xutility>: Fix conversion between basic_const_iterators #5325

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
merged 2 commits into from
Mar 13, 2025
Merged

<xutility>: Fix conversion between basic_const_iterators #5325

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
3d59eb7
Fix conversion between `basic_const_iterator`s
frederick-vs-ja Mar 6, 2025
903b690
Fix typo and execute the test cases
frederick-vs-ja Mar 6, 2025
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: 3 additions & 0 deletions stl/inc/xutility
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,6 +2211,9 @@ struct _Basic_const_iterator_category<_Iter> {
_EXPORT_STD template <input_iterator _Iter>
class basic_const_iterator : public _Basic_const_iterator_category<_Iter> {
private:
template <input_iterator>
friend class basic_const_iterator;

/* [[no_unique_address]] */ _Iter _Current{};

using _Reference = iter_const_reference_t<_Iter>;
Expand Down
26 changes: 26 additions & 0 deletions tests/std/tests/P2278R4_basic_const_iterator/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,35 @@ constexpr void test_p2836r1() {
}
}

// GH-5321 "<xutility>: basic_const_iterator<int *> Cannot Convert to basic_const_iterator<const int *>"
constexpr void test_conversion_instantiation() {
struct Base {};
struct Derived : Base {};

{
basic_const_iterator<const int*> cit = basic_const_iterator<int*>{};
assert(cit.base() == nullptr);
}
{
int n{};
basic_const_iterator<const int*> cit = basic_const_iterator<int*>{&n};
assert(cit.base() == &n);
}
{
basic_const_iterator<Base*> cit = basic_const_iterator<Derived*>{};
assert(cit.base() == nullptr);
}
{
Derived d{};
basic_const_iterator<Base*> cit = basic_const_iterator<Derived*>{&d};
assert(cit.base() == static_cast<Base*>(&d));
}
}

constexpr bool all_tests() {
instantiation_test();
test_p2836r1();
test_conversion_instantiation();
return true;
}

Expand Down