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

diff --git a/src/lib/ipc/IpcLogOutputter.h b/src/lib/ipc/IpcLogOutputter.h
index 2f1b98c..cc7b2fe 100644
--- a/src/lib/ipc/IpcLogOutputter.h
+++ b/src/lib/ipc/IpcLogOutputter.h
@@ -21,6 +21,7 @@
 #include "arch/Arch.h"
 #include "arch/IArchMultithread.h"
 #include "base/ILogOutputter.h"
+#include "base/String.h"
 #include "ipc/Ipc.h"
 
 #include <deque>
@@ -92,12 +93,12 @@ public:
 private:
     void                init();
     void                bufferThread(void*);
-    String                getChunk(size_t count);
-    void                appendBuffer(const String& text);
+    std::string getChunk(size_t count);
+    void appendBuffer(const std::string& text);
     bool                isRunning();
 
 private:
-    typedef std::deque<String> Buffer;
+    typedef std::deque<std::string> Buffer;
 
     IpcServer&            m_ipcServer;
     Buffer                m_buffer;