From 319dc87eea0451f6b82d06a0dbb1849e6478a8f9 Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Tue, 19 Feb 2019 15:35:00 +0100 Subject: [PATCH] Remove #undef new/delete before Qt includes This has not been necessary anymore since a1885006 ("Remove MS CRT memory management debugging"). --- src/editor/C4ConsoleQt.h | 3 --- src/graphics/C4DrawGLCtx.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/editor/C4ConsoleQt.h b/src/editor/C4ConsoleQt.h index 274907330..42ca9e104 100644 --- a/src/editor/C4ConsoleQt.h +++ b/src/editor/C4ConsoleQt.h @@ -21,9 +21,6 @@ #ifdef WITH_QT_EDITOR -// Avoid some name conflicts -#undef new -#undef delete // disable OPENGL_ES // (not necessery if Qt is compiled with -opengl desktop) //#define QT_OPENGL_ES_2 diff --git a/src/graphics/C4DrawGLCtx.cpp b/src/graphics/C4DrawGLCtx.cpp index 02a782b55..620dd60a2 100644 --- a/src/graphics/C4DrawGLCtx.cpp +++ b/src/graphics/C4DrawGLCtx.cpp @@ -528,8 +528,6 @@ bool CStdGLCtx::PageFlip() #endif // USE_* #ifdef WITH_QT_EDITOR -#undef new -#undef delete #include #include #include