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, 4 insertions, 4 deletions

diff --git a/src/lib/platform/MSWindowsWatchdog.h b/src/lib/platform/MSWindowsWatchdog.h
index 7a1f661..0a81521 100644
--- a/src/lib/platform/MSWindowsWatchdog.h
+++ b/src/lib/platform/MSWindowsWatchdog.h
@@ -55,8 +55,8 @@ private:
     HANDLE                duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTES security);
     HANDLE                getUserToken(LPSECURITY_ATTRIBUTES security);
     void                startProcess();
-    BOOL                doStartProcessAsUser(String& command, HANDLE userToken, LPSECURITY_ATTRIBUTES sa);
-    BOOL                doStartProcessAsSelf(String& command);
+    BOOL doStartProcessAsUser(std::string& command, HANDLE userToken, LPSECURITY_ATTRIBUTES sa);
+    BOOL doStartProcessAsSelf(std::string& command);
 
 private:
     Thread*                m_thread;
@@ -85,8 +85,8 @@ An error occured in the process watchdog.
 */
 class XMSWindowsWatchdogError : public XBarrier {
 public:
-    XMSWindowsWatchdogError(const String& msg) : XBarrier(msg) { }
+    XMSWindowsWatchdogError(const std::string& msg) : XBarrier(msg) { }
 
     // XBase overrides
-    virtual String        getWhat() const throw() { return what(); }
+    virtual std::string getWhat() const noexcept { return what(); }
 };