From c74ccc22f3289240347ed8846806c0b83aed1bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 29 Jun 2014 15:07:56 +0200 Subject: [PATCH] Platform: fix AndroidApplication compilation. Using type before it was defined. Blind changes FTW! --- src/Magnum/Platform/AndroidApplication.cpp | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Magnum/Platform/AndroidApplication.cpp b/src/Magnum/Platform/AndroidApplication.cpp index e9ede0982..cd03be2d0 100644 --- a/src/Magnum/Platform/AndroidApplication.cpp +++ b/src/Magnum/Platform/AndroidApplication.cpp @@ -34,19 +34,6 @@ namespace Magnum { namespace Platform { -#ifndef DOXYGEN_GENERATING_OUTPUT -AndroidApplication::AndroidApplication(const Arguments& arguments): AndroidApplication{arguments, Configuration{}} {} -#endif - -AndroidApplication::AndroidApplication(const Arguments& arguments, const Configuration& configuration): AndroidApplication{arguments, nullptr} { - createContext(configuration); -} - -AndroidApplication::AndroidApplication(const Arguments& arguments, std::nullptr_t): _state(arguments) { - /* Redirect debug output to Android log */ - _logOutput.reset(new LogOutput); -} - AndroidApplication::~AndroidApplication() { eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglDestroyContext(_display, _context); @@ -61,6 +48,19 @@ struct AndroidApplication::LogOutput { std::ostream debugStream, warningStream, errorStream; }; +#ifndef DOXYGEN_GENERATING_OUTPUT +AndroidApplication::AndroidApplication(const Arguments& arguments): AndroidApplication{arguments, Configuration{}} {} +#endif + +AndroidApplication::AndroidApplication(const Arguments& arguments, const Configuration& configuration): AndroidApplication{arguments, nullptr} { + createContext(configuration); +} + +AndroidApplication::AndroidApplication(const Arguments& arguments, std::nullptr_t): _state(arguments) { + /* Redirect debug output to Android log */ + _logOutput.reset(new LogOutput); +} + AndroidApplication::LogOutput::LogOutput(): debugBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Info, "magnum"), warningBuffer(Utility::AndroidLogStreamBuffer::LogPriority::Warning, "magnum"),