Browse Source

Platform: fix AndroidApplication compilation.

Using type before it was defined. Blind changes FTW!
pull/55/merge
Vladimír Vondruš 12 years ago
parent
commit
c74ccc22f3
  1. 26
      src/Magnum/Platform/AndroidApplication.cpp

26
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"),

Loading…
Cancel
Save