Skip to content
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

Fix C4003 NOMINMAX bug #531

Merged
merged 2 commits into from
Jul 25, 2020
Merged

Fix C4003 NOMINMAX bug #531

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
ead6ef8
Fix C4003 NOMINMAX bug
cugone Jul 22, 2020
d18baf7
Added self to AUTHORS file under Contributors
cugone Jul 24, 2020
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ceeac
ColinH
corystegel
Croydon
cugone
dbacchet
dBagrat
djarek
Expand Down
4 changes: 2 additions & 2 deletions src/entt/entity/view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> {
{}

[[nodiscard]] const sparse_set<Entity> & candidate() const ENTT_NOEXCEPT {
return *std::min({ static_cast<const sparse_set<Entity> *>(std::get<pool_type<Component> *>(pools))... }, [](const auto *lhs, const auto *rhs) {
return *(std::min)({ static_cast<const sparse_set<Entity> *>(std::get<pool_type<Component> *>(pools))... }, [](const auto *lhs, const auto *rhs) {
return lhs->size() < rhs->size();
});
}
Expand Down Expand Up @@ -320,7 +320,7 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> {
* @return Estimated number of entities iterated by the view.
*/
[[nodiscard]] size_type size() const ENTT_NOEXCEPT {
return std::min({ std::get<pool_type<Component> *>(pools)->size()... });
return (std::min)({ std::get<pool_type<Component> *>(pools)->size()... });
}

/**
Expand Down