Add move semantics to Variant

[libs/core.git] / source / io / memory.h

diff --git a/source/io/memory.h b/source/io/memory.h
index c24d3f78e6ec3c123b7f99736fb858533f66de94..e009cfdd24965d701d745e4dd865734615d4e85c 100644 (file)
--- a/source/io/memory.h
+++ b/source/io/memory.h
@@ -1,12 +1,13 @@
 #ifndef MSP_IO_MEMORY_H_
 #define MSP_IO_MEMORY_H_
 
+#include <msp/core/mspcore_api.h>
 #include "seekable.h"
 
 namespace Msp {
 namespace IO {
 
-class Memory: public Seekable
+class MSPCORE_API Memory: public Seekable
 {
 private:
        char *begin = nullptr;
@@ -14,26 +15,26 @@ private:
        char *pos = nullptr;
 
 public:
-       Memory(char *d, std::size_t s, Mode m = M_RDWR): Memory(d, d+s, m) { }
+       Memory(char *d, std::size_t s, Mode m = M_RDWR);
        Memory(char *, char *, Mode = M_RDWR);
-       Memory(const char *d, std::size_t s): Memory(const_cast<char *>(d), const_cast<char *>(d+s), M_READ) { }
-       Memory(const char *b, const char *e): Memory(const_cast<char *>(b), const_cast<char *>(e), M_READ) { }
+       Memory(const char *d, std::size_t s);
+       Memory(const char *b, const char *e);
 
-       virtual void set_block(bool);
-       virtual void set_inherit(bool);
+       void set_block(bool) override;
+       void set_inherit(bool) override;
 
 private:
-       virtual std::size_t do_write(const char *, std::size_t);
-       virtual std::size_t do_read(char *, std::size_t);
+       std::size_t do_write(const char *, std::size_t) override;
+       std::size_t do_read(char *, std::size_t) override;
 public:
-       virtual std::size_t put(char);
-       virtual bool getline(std::string &);
-       virtual int get();
+       std::size_t put(char) override;
+       bool getline(std::string &) override;
+       int get() override;
 
-       virtual const Handle &get_handle(Mode);
+       const Handle &get_handle(Mode) override;
 
-       virtual SeekOffset seek(SeekOffset, SeekType);
-       virtual SeekOffset tell() const { return pos-begin; }
+       SeekOffset seek(SeekOffset, SeekType) override;
+       SeekOffset tell() const override { return pos-begin; }
 };
 
 } // namespace IO