From 80f37d52626aba19637d5cdc6ab11918a06fc45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 11 Mar 2019 21:22:37 +0100 Subject: [PATCH] Platforms: Pointer_stringify() is no more. --- doc/changelog.dox | 2 ++ doc/snippets/platforms-html5.cpp | 2 +- src/Magnum/Platform/Sdl2Application.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index fc2bab7f1..c50d7dbfc 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -141,6 +141,8 @@ See also: @ref MAGNUM_TARGET_DESKTOP_GLES is defined. This allows for a smoother experience for example when using ANGLE on Windows. See @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 diff --git a/doc/snippets/platforms-html5.cpp b/doc/snippets/platforms-html5.cpp index 29fabbd9f..6140eb6f2 100644 --- a/doc/snippets/platforms-html5.cpp +++ b/doc/snippets/platforms-html5.cpp @@ -33,7 +33,7 @@ int main() { #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension" std::string title; EM_ASM_({document.getElementById('title').innerHTML = - Pointer_stringify($0, $1)}, title.data(), title.size()); + UTF8ToString($0)}, title.data()); #pragma GCC diagnostic pop /* [emasm-dollar] */ } diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index 1ce0d4f44..2d1b557e9 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -565,7 +565,7 @@ Vector2i Sdl2Application::framebufferSize() const { void Sdl2Application::setContainerCssClass(const std::string& cssClass) { #pragma GCC diagnostic push #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 } #endif