ANGLE: Fix compilation with MSVC2013.
Add missing include for std::min(), std::max(). Change-Id: I740e5db94f9f958ac65de8dd7baab7e203482637 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
parent
9ae94806ad
commit
b66a217a1c
2
src/3rdparty/angle/src/libEGL/Surface.cpp
vendored
2
src/3rdparty/angle/src/libEGL/Surface.cpp
vendored
@ -20,6 +20,8 @@
|
|||||||
#include "libEGL/main.h"
|
#include "libEGL/main.h"
|
||||||
#include "libEGL/Display.h"
|
#include "libEGL/Display.h"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
namespace egl
|
namespace egl
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -0,0 +1,28 @@
|
|||||||
|
From 4863cf64cd332a5fcefe453634c3c5ef62cb758c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
||||||
|
Date: Thu, 24 Oct 2013 12:49:59 +0300
|
||||||
|
Subject: [PATCH] ANGLE: Fix compilation with MSVC2013.
|
||||||
|
|
||||||
|
Add missing include for std::min(), std::max().
|
||||||
|
|
||||||
|
Change-Id: I740e5db94f9f958ac65de8dd7baab7e203482637
|
||||||
|
---
|
||||||
|
src/3rdparty/angle/src/libEGL/Surface.cpp | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/angle/src/libEGL/Surface.cpp b/src/3rdparty/angle/src/libEGL/Surface.cpp
|
||||||
|
index b47a7bc..83fbbf5 100644
|
||||||
|
--- a/src/3rdparty/angle/src/libEGL/Surface.cpp
|
||||||
|
+++ b/src/3rdparty/angle/src/libEGL/Surface.cpp
|
||||||
|
@@ -20,6 +20,8 @@
|
||||||
|
#include "libEGL/main.h"
|
||||||
|
#include "libEGL/Display.h"
|
||||||
|
|
||||||
|
+#include <algorithm>
|
||||||
|
+
|
||||||
|
namespace egl
|
||||||
|
{
|
||||||
|
|
||||||
|
--
|
||||||
|
1.8.3.msysgit.0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user