Merge pull request #20 from fcharlie/avoid_compile_failed_std_min

Avoid building failures on the Windows platform
This commit is contained in:
Gregory Popovitch
2019-07-29 07:32:20 -04:00
committed by GitHub
+1 -1
View File
@@ -1543,7 +1543,7 @@ public:
}
// bitor is a faster way of doing `max` here. We will round up to the next
// power-of-2-minus-1, so bitor is good enough.
auto m = NormalizeCapacity(std::max(n, size()));
auto m = NormalizeCapacity((std::max)(n, size()));
// n == 0 unconditionally rehashes as per the standard.
if (n == 0 || m > capacity_) {
resize(m);