Update upstream source from tag 'upstream/2.3.3+dfsg'

Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f

1 files changed, 7 insertions, 10 deletions

diff --git a/src/lib/platform/MSWindowsUtil.cpp b/src/lib/platform/MSWindowsUtil.cpp
index b657906..b6b809f 100644
--- a/src/lib/platform/MSWindowsUtil.cpp
+++ b/src/lib/platform/MSWindowsUtil.cpp
@@ -18,29 +18,26 @@
 
 #include "platform/MSWindowsUtil.h"
 
-#include "base/String.h"
-
 #include <stdio.h>
+#include "base/String.h"
 
 //
 // MSWindowsUtil
 //
 
-String
-MSWindowsUtil::getString(HINSTANCE instance, DWORD id)
+std::string MSWindowsUtil::getString(HINSTANCE instance, DWORD id)
 {
     char* msg = NULL;
     int n = LoadString(instance, id, reinterpret_cast<LPSTR>(&msg), 0);
 
     if (n <= 0) {
-        return String();
+        return {};
     }
 
-    return String (msg, n);
+    return std::string (msg, n);
 }
 
-String
-MSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWORD id)
+std::string MSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWORD id)
 {
     char* buffer;
     if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
@@ -52,12 +49,12 @@ MSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWORD id)
                                 (LPTSTR)&buffer,
                                 0,
                                 NULL) == 0) {
-        String errorString = barrier::string::sprintf("%d", error);
+        std::string errorString = barrier::string::sprintf("%d", error);
         return barrier::string::format(getString(hinstance, id).c_str(),
                             errorString.c_str());
     }
     else {
-        String result(buffer);
+        std::string result(buffer);
         LocalFree(buffer);
         return result;
     }