From 3e49ad80f52d84d5df13b68217992a406d2b1f30 Mon Sep 17 00:00:00 2001 From: etnav <125358773+etnav@users.noreply.github.com> Date: Thu, 23 Mar 2023 13:21:52 +0100 Subject: [PATCH] Pass a std::string instead of function return value (#918) --- platform/windows/src/headless_backend_egl.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/platform/windows/src/headless_backend_egl.cpp b/platform/windows/src/headless_backend_egl.cpp index 21db01251..be84e1a7b 100644 --- a/platform/windows/src/headless_backend_egl.cpp +++ b/platform/windows/src/headless_backend_egl.cpp @@ -6,6 +6,8 @@ #include #include +#include +#include namespace mbgl { namespace gl { @@ -30,8 +32,9 @@ public: } if (!eglBindAPI(EGL_OPENGL_ES_API)) { - mbgl::Log::Error(mbgl::Event::OpenGL, "eglBindAPI(EGL_OPENGL_ES_API) returned error %d", - eglGetError()); + std::ostringstream logMsg; + logMsg << "eglBindAPI(EGL_OPENGL_ES_API) returned error " << eglGetError(); + mbgl::Log::Error(mbgl::Event::OpenGL, logMsg.str()); throw std::runtime_error("eglBindAPI() failed"); } @@ -82,8 +85,9 @@ public: eglContext = eglCreateContext(eglDisplay->display, eglDisplay->config, EGL_NO_CONTEXT, attribs); if (eglContext == EGL_NO_CONTEXT) { - mbgl::Log::Error(mbgl::Event::OpenGL, "eglCreateContext() returned error 0x%04x", - eglGetError()); + std::ostringstream logMsg; + logMsg << "eglCreateContext() returned error 0x" << std::setw(4) << std::setfill('0') << std::hex << eglGetError(); + mbgl::Log::Error(mbgl::Event::OpenGL, logMsg.str()); throw std::runtime_error("Error creating the EGL context object.\n"); } @@ -100,7 +104,7 @@ public: eglSurface = eglCreatePbufferSurface(eglDisplay->display, eglDisplay->config, surfAttribs); if (eglSurface == EGL_NO_SURFACE) { - throw std::runtime_error("Could not create surface: " + util::toString(eglGetError())); + throw std::runtime_error("Could not create surface: " + std::to_string(eglGetError())); } }