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, 3 insertions, 2 deletions

diff --git a/src/lib/base/log_outputters.cpp b/src/lib/base/log_outputters.cpp
index 8e56c26..af53192 100644
--- a/src/lib/base/log_outputters.cpp
+++ b/src/lib/base/log_outputters.cpp
@@ -19,6 +19,7 @@
 #include "base/log_outputters.h"
 #include "base/TMethodJob.h"
 #include "arch/Arch.h"
+#include "base/String.h"
 
 #include <fstream>
 
@@ -228,7 +229,7 @@ BufferedLogOutputter::write(ELevel, const char* message)
     while (m_buffer.size() >= m_maxBufferSize) {
         m_buffer.pop_front();
     }
-    m_buffer.push_back(String(message));
+    m_buffer.push_back(std::string(message));
     return true;
 }
 
@@ -272,7 +273,7 @@ FileLogOutputter::write(ELevel level, const char *message)
     m_handle.close();
 
     if (moveFile) {
-        String oldLogFilename = barrier::string::sprintf("%s.1", m_fileName.c_str());
+        std::string oldLogFilename = barrier::string::sprintf("%s.1", m_fileName.c_str());
         remove(oldLogFilename.c_str());
         rename(m_fileName.c_str(), oldLogFilename.c_str());
     }