From aace5819152ea1ad1d914e4c943d728f164c80a1 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Mon, 18 Jan 2016 12:26:32 +0100 Subject: [PATCH] Fixed the most stupid thing ever found on windows yet. std::max forbidden trololololol --- lib/Basics/VelocyPackHelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Basics/VelocyPackHelper.cpp b/lib/Basics/VelocyPackHelper.cpp index 4abf1d085f..58d048aec0 100644 --- a/lib/Basics/VelocyPackHelper.cpp +++ b/lib/Basics/VelocyPackHelper.cpp @@ -360,7 +360,7 @@ int VelocyPackHelper::compare(VPackSlice const& lhs, VPackSlice const& rhs, case VPackValueType::Array: { VPackValueLength const nl = lhs.length(); VPackValueLength const nr = rhs.length(); - VPackValueLength const n = std::max(nr, nl); + VPackValueLength const n = (std::max)(nr, nl); for (VPackValueLength i = 0; i < n; ++i) { VPackSlice lhsValue; if (i < nl) {