From 1ee02d4fcf0969c7ed3b35dbca16dd81b0425963 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Wed, 17 Dec 2014 13:53:59 +0100
Subject: [PATCH] Improved code, fixed missing includes

Thanks to d@rk-marouane (@progdupeu.pl)


Former-commit-id: 4147388501d4263e624f4c6402902ef071f88ffd
---
 include/Nazara/Core/Color.inl    | 7 ++++---
 src/Nazara/Utility/VideoMode.cpp | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/Nazara/Core/Color.inl b/include/Nazara/Core/Color.inl
index 3357f5c20..662c86911 100644
--- a/include/Nazara/Core/Color.inl
+++ b/include/Nazara/Core/Color.inl
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/StringStream.hpp>
+#include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <stdexcept>
@@ -235,7 +236,7 @@ inline void NzColor::ToCMYK(const NzColor& color, float* cyan, float* magenta, f
 	float c, m, y;
 	ToCMY(color, &c, &m, &y);
 
-	float k = std::min(std::min(std::min(1.f, c), m), y);
+	float k = std::min({1.f, c, m, y});
 
 	if (NzNumberEquals(k, 1.f))
 	{
@@ -260,8 +261,8 @@ inline void NzColor::ToHSL(const NzColor& color, nzUInt8* hue, nzUInt8* saturati
 	float g = color.g / 255.f;
 	float b = color.b / 255.f;
 
-	float min = std::min(std::min(r, g), b); // Min. value of RGB
-	float max = std::max(std::max(r, g), b); // Max. value of RGB
+	float min = std::min({r, g, b}); // Min. value of RGB
+	float max = std::max({r, g, b}); // Max. value of RGB
 
 	float deltaMax = max - min; //Delta RGB value
 
diff --git a/src/Nazara/Utility/VideoMode.cpp b/src/Nazara/Utility/VideoMode.cpp
index ce28eeed3..c3d2b81c1 100644
--- a/src/Nazara/Utility/VideoMode.cpp
+++ b/src/Nazara/Utility/VideoMode.cpp
@@ -5,6 +5,7 @@
 #include <Nazara/Utility/VideoMode.hpp>
 #include <Nazara/Utility/VideoModeImpl.hpp>
 #include <algorithm>
+#include <functional>
 #include <Nazara/Utility/Debug.hpp>
 
 NzVideoMode::NzVideoMode() :