Browse Source

Platforms: Pointer_stringify() is no more.

pull/331/head
Vladimír Vondruš 7 years ago
parent
commit
80f37d5262
  1. 2
      doc/changelog.dox
  2. 2
      doc/snippets/platforms-html5.cpp
  3. 2
      src/Magnum/Platform/Sdl2Application.cpp

2
doc/changelog.dox

@ -141,6 +141,8 @@ See also:
@ref MAGNUM_TARGET_DESKTOP_GLES is defined. This allows for a smoother @ref MAGNUM_TARGET_DESKTOP_GLES is defined. This allows for a smoother
experience for example when using ANGLE on Windows. See experience for example when using ANGLE on Windows. See
@ref Platform-Sdl2Application-usage-gles for more information. @ref Platform-Sdl2Application-usage-gles for more information.
- Replaced uses of `Pointer_stringify()` in @ref Platform::Sdl2Application
which was removed in Emscripten 1.38.27
@subsubsection changelog-latest-changes-text Text library @subsubsection changelog-latest-changes-text Text library

2
doc/snippets/platforms-html5.cpp

@ -33,7 +33,7 @@ int main() {
#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension" #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
std::string title; std::string title;
EM_ASM_({document.getElementById('title').innerHTML = EM_ASM_({document.getElementById('title').innerHTML =
Pointer_stringify($0, $1)}, title.data(), title.size()); UTF8ToString($0)}, title.data());
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
/* [emasm-dollar] */ /* [emasm-dollar] */
} }

2
src/Magnum/Platform/Sdl2Application.cpp

@ -565,7 +565,7 @@ Vector2i Sdl2Application::framebufferSize() const {
void Sdl2Application::setContainerCssClass(const std::string& cssClass) { void Sdl2Application::setContainerCssClass(const std::string& cssClass) {
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension" #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
EM_ASM_({document.getElementById('container').className = Pointer_stringify($0, $1);}, cssClass.data(), cssClass.size()); EM_ASM_({document.getElementById('container').className = AsciiToString($0);}, cssClass.data());
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
} }
#endif #endif

Loading…
Cancel
Save