aboutsummaryrefslogtreecommitdiff
path: root/src/libutil/serialise.hh
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-07-13 06:03:37 -0400
committerShea Levy <shea@shealevy.com>2016-07-13 06:03:37 -0400
commitb33e85229d3ac78242d8bc597cfdaa282486743f (patch)
tree9d09256f79aa610b4c2d344e640b3e9fc6237cad /src/libutil/serialise.hh
parentcb5e7254b66a06b78a5659551a6f28fc67e52267 (diff)
Make Buffered{Source,Sink} move-safe
Diffstat (limited to 'src/libutil/serialise.hh')
-rw-r--r--src/libutil/serialise.hh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 892ec4aa3..0139bed1c 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -1,5 +1,7 @@
#pragma once
+#include <memory>
+
#include "types.hh"
#include "util.hh"
@@ -25,11 +27,10 @@ struct Sink
struct BufferedSink : Sink
{
size_t bufSize, bufPos;
- unsigned char * buffer;
+ std::unique_ptr<unsigned char[]> buffer;
BufferedSink(size_t bufSize = 32 * 1024)
- : bufSize(bufSize), bufPos(0), buffer(0) { }
- ~BufferedSink();
+ : bufSize(bufSize), bufPos(0), buffer(nullptr) { }
void operator () (const unsigned char * data, size_t len) override;
@@ -67,11 +68,10 @@ struct Source
struct BufferedSource : Source
{
size_t bufSize, bufPosIn, bufPosOut;
- unsigned char * buffer;
+ std::unique_ptr<unsigned char[]> buffer;
BufferedSource(size_t bufSize = 32 * 1024)
- : bufSize(bufSize), bufPosIn(0), bufPosOut(0), buffer(0) { }
- ~BufferedSource();
+ : bufSize(bufSize), bufPosIn(0), bufPosOut(0), buffer(nullptr) { }
size_t read(unsigned char * data, size_t len) override;