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, 6 deletions

diff --git a/src/lib/ipc/IpcLogOutputter.cpp b/src/lib/ipc/IpcLogOutputter.cpp
index b62c76a..44ecdba 100644
--- a/src/lib/ipc/IpcLogOutputter.cpp
+++ b/src/lib/ipc/IpcLogOutputter.cpp
@@ -44,8 +44,8 @@ IpcLogOutputter::IpcLogOutputter(IpcServer& ipcServer, EIpcClientType clientType
     m_running(false),
     m_notifyCond(ARCH->newCondVar()),
     m_notifyMutex(ARCH->newMutex()),
-    m_bufferThreadId(0),
     m_bufferWaiting(false),
+    m_bufferThreadId(0),
     m_bufferMaxSize(kBufferMaxSize),
     m_bufferRateWriteLimit(kBufferRateWriteLimit),
     m_bufferRateTimeLimit(kBufferRateTimeLimit),
@@ -109,8 +109,7 @@ IpcLogOutputter::write(ELevel, const char* text)
     return true;
 }
 
-void
-IpcLogOutputter::appendBuffer(const String& text)
+void IpcLogOutputter::appendBuffer(const std::string& text)
 {
     std::lock_guard<std::mutex> lock(m_bufferMutex);
 
@@ -173,8 +172,7 @@ IpcLogOutputter::notifyBuffer()
     ARCH->broadcastCondVar(m_notifyCond);
 }
 
-String
-IpcLogOutputter::getChunk(size_t count)
+std::string IpcLogOutputter::getChunk(size_t count)
 {
     std::lock_guard<std::mutex> lock(m_bufferMutex);
 
@@ -182,7 +180,7 @@ IpcLogOutputter::getChunk(size_t count)
         count = m_buffer.size();
     }
 
-    String chunk;
+    std::string chunk;
     for (size_t i = 0; i < count; i++) {
         chunk.append(m_buffer.front());
         chunk.append("\n");