From 7f23740e82b1eb45b4bed4e95ab5ea76cd0f51f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 12 Dec 2018 01:18:21 +0100 Subject: [PATCH] Ugh, GL leftovers. --- src/Magnum/Magnum.h | 4 ---- src/Magnum/Mesh.cpp | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index deba6a7c5..61d00d4dc 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -42,10 +42,6 @@ #endif #endif -#ifndef DOXYGEN_GENERATING_OUTPUT -typedef unsigned int GLenum; /* Needed for *Format and *Type enums */ -#endif - namespace Magnum { /* Bring whole Corrade namespace */ diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index a07b7b308..8eca38f0e 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -70,7 +70,7 @@ Debug& operator<<(Debug& debug, MeshPrimitive value) { /* LCOV_EXCL_STOP */ } - return debug << "MeshPrimitive(" << Debug::nospace << reinterpret_cast(GLenum(value)) << Debug::nospace << ")"; + return debug << "MeshPrimitive(" << Debug::nospace << reinterpret_cast(UnsignedInt(value)) << Debug::nospace << ")"; } Debug& operator<<(Debug& debug, MeshIndexType value) { @@ -84,7 +84,7 @@ Debug& operator<<(Debug& debug, MeshIndexType value) { /* LCOV_EXCL_STOP */ } - return debug << "MeshIndexType(" << Debug::nospace << reinterpret_cast(GLenum(value)) << Debug::nospace << ")"; + return debug << "MeshIndexType(" << Debug::nospace << reinterpret_cast(UnsignedInt(value)) << Debug::nospace << ")"; } #endif