Skip to content

[libc++][test] Fixes for hash<Emplaceable> and value discarding #126566

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 1 commit into from
Feb 10, 2025
Merged

[libc++][test] Fixes for hash<Emplaceable> and value discarding #126566

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
2 changes: 1 addition & 1 deletion libcxx/test/std/containers/Emplaceable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct std::hash<Emplaceable> {
typedef Emplaceable argument_type;
typedef std::size_t result_type;

std::size_t operator()(const Emplaceable& x) const { return x.get(); }
std::size_t operator()(const Emplaceable& x) const { return static_cast<std::size_t>(x.get()); }
};

#endif // TEST_STD_VER >= 11
Expand Down
2 changes: 1 addition & 1 deletion ...x/test/std/containers/container.adaptors/flat.map/flat.map.access/at_transparent.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ int main(int, char**) {
TransparentComparator c(transparent_used);
std::flat_map<int, int, TransparentComparator> m(std::sorted_unique, {{1, 1}, {2, 2}, {3, 3}}, c);
assert(!transparent_used);
m.at(Transparent<int>{3});
TEST_IGNORE_NODISCARD m.at(Transparent<int>{3});
assert(transparent_used);
}

Expand Down