*: fix C4003 NOMINMAX issue (#531)

skypjack · Jul 25, 2020 · 617fb18 · 617fb18
1 parent 09e0f68
commit 617fb18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -11,6 +11,7 @@ ceeac
 ColinH
 corystegel
 Croydon
+cugone
 dbacchet
 dBagrat
 djarek

diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp
@@ -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();
         });
     }
@@ -345,7 +345,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()... });
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ ceeac @@
     ColinH
     corystegel
     Croydon
+    cugone
     dbacchet
     dBagrat
     djarek
@@ Expand Down @@