From c610bc15b4e012b129603ebfafba2d0e05c595d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 18 Sep 2013 22:39:19 +0200 Subject: [PATCH] GCC 4.5 compatibility: some explicit typing needed. --- src/Platform/AbstractXApplication.cpp | 3 ++- src/Platform/GlutApplication.cpp | 3 ++- src/Platform/Sdl2Application.cpp | 3 ++- src/Platform/magnum-info.cpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Platform/AbstractXApplication.cpp b/src/Platform/AbstractXApplication.cpp index 423879c86..2951900c0 100644 --- a/src/Platform/AbstractXApplication.cpp +++ b/src/Platform/AbstractXApplication.cpp @@ -43,7 +43,8 @@ AbstractXApplication::AbstractXApplication(AbstractContextHandler* contextHandler, const Arguments&): contextHandler(contextHandler), c(nullptr), flags(Flag::Redraw) { - createContext({}); + /* GCC 4.5 can't handle {} here (wtf) */ + createContext(Configuration()); } #endif diff --git a/src/Platform/GlutApplication.cpp b/src/Platform/GlutApplication.cpp index f5341cb61..718db343f 100644 --- a/src/Platform/GlutApplication.cpp +++ b/src/Platform/GlutApplication.cpp @@ -40,7 +40,8 @@ GlutApplication::GlutApplication(const Arguments& arguments, const Configuration #ifndef DOXYGEN_GENERATING_OUTPUT GlutApplication::GlutApplication(const Arguments& arguments): c(nullptr) { initialize(arguments.argc, arguments.argv); - createContext({}); + /* GCC 4.5 can't handle {} here (wtf) */ + createContext(Configuration()); } #endif diff --git a/src/Platform/Sdl2Application.cpp b/src/Platform/Sdl2Application.cpp index c531db63a..7fb919d46 100644 --- a/src/Platform/Sdl2Application.cpp +++ b/src/Platform/Sdl2Application.cpp @@ -56,7 +56,8 @@ Sdl2Application::Sdl2Application(const Arguments&, const Configuration& configur #ifndef DOXYGEN_GENERATING_OUTPUT Sdl2Application::Sdl2Application(const Arguments&): context(nullptr), flags(Flag::Redraw) { initialize(); - createContext({}); + /* GCC 4.5 can't handle {} here (wtf) */ + createContext(Configuration()); } #endif diff --git a/src/Platform/magnum-info.cpp b/src/Platform/magnum-info.cpp index 2a03f33b5..3579ed244 100644 --- a/src/Platform/magnum-info.cpp +++ b/src/Platform/magnum-info.cpp @@ -54,7 +54,8 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat /* Create context after parsing arguments, so the help can be displayed without creating context */ - createContext({}); + /* GCC 4.5 can't handle {} here (wtf) */ + createContext(Configuration()); Context* c = Context::current(); /* Pass debug output as messages to JavaScript */