From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 21 Jul 2020 06:15:04 -0400 Subject: New upstream version 2.3.3+dfsg. --- src/lib/platform/MSWindowsUtil.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/platform/MSWindowsUtil.h') diff --git a/src/lib/platform/MSWindowsUtil.h b/src/lib/platform/MSWindowsUtil.h index 29eef2e..59f2eac 100644 --- a/src/lib/platform/MSWindowsUtil.h +++ b/src/lib/platform/MSWindowsUtil.h @@ -18,7 +18,7 @@ #pragma once -#include "base/String.h" +#include #define WINDOWS_LEAN_AND_MEAN #include @@ -29,14 +29,14 @@ public: /*! Gets a string for \p id from the string table of \p instance. */ - static String getString(HINSTANCE instance, DWORD id); + static std::string getString(HINSTANCE instance, DWORD id); //! Get error string /*! Gets a system error message for \p error. If the error cannot be found return the string for \p id, replacing ${1} with \p error. */ - static String getErrorString(HINSTANCE, DWORD error, DWORD id); + static std::string getErrorString(HINSTANCE, DWORD error, DWORD id); //! Create directory /*! -- cgit v1.2.3