summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-10-01 19:53:04 -0400
committerDavid Robillard <d@drobilla.net>2016-10-01 19:53:04 -0400
commitf7bbd02b6bfdb3d09146488cfeebf26722abaa0c (patch)
tree5429ce634eb5ffe5b83dbf83578f62db577c4a61 /ingen
parent97bfcd3b24e7ae385cdec84363f9c868f580beb3 (diff)
parentc73c877f8bd09e0d5a6663ea5ba32a54465f5376 (diff)
downloadingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.tar.gz
ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.tar.bz2
ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.zip
Merge branch 'master' into parallel
Diffstat (limited to 'ingen')
-rw-r--r--ingen/SocketWriter.hpp2
-rw-r--r--ingen/StreamWriter.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ingen/SocketWriter.hpp b/ingen/SocketWriter.hpp
index 871a63f5..e8b522f6 100644
--- a/ingen/SocketWriter.hpp
+++ b/ingen/SocketWriter.hpp
@@ -34,7 +34,7 @@ public:
const Raul::URI& uri,
SPtr<Raul::Socket> sock);
- size_t text_sink(const void* buf, size_t len) override;
+ size_t text_sink(const void* buf, size_t len);
/** Override of bundle_end to terminate bundles in the stream. */
void bundle_end();
diff --git a/ingen/StreamWriter.hpp b/ingen/StreamWriter.hpp
index 7a62382c..cefd51cc 100644
--- a/ingen/StreamWriter.hpp
+++ b/ingen/StreamWriter.hpp
@@ -35,7 +35,7 @@ public:
FILE* stream,
ColorContext::Color color);
- size_t text_sink(const void* buf, size_t len) override;
+ size_t text_sink(const void* buf, size_t len);
protected:
FILE* _stream;