X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fmemory.h;h=75cf7f5a6056ff052ebef19b4622692f6bf138d5;hp=ba6c4d87995306653d0eda5ca245b95566ffb645;hb=HEAD;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/io/memory.h b/source/io/memory.h
index ba6c4d8..e009cfd 100644
--- a/source/io/memory.h
+++ b/source/io/memory.h
@@ -1,41 +1,40 @@
 #ifndef MSP_IO_MEMORY_H_
 #define MSP_IO_MEMORY_H_
 
-#include "base.h"
-#include "seek.h"
+#include <msp/core/mspcore_api.h>
+#include "seekable.h"
 
 namespace Msp {
 namespace IO {
 
-class Memory: public Base
+class MSPCORE_API Memory: public Seekable
 {
 private:
-	char *begin;
-	char *end;
-	char *pos;
+	char *begin = nullptr;
+	char *end = nullptr;
+	char *pos = nullptr;
 
 public:
-	Memory(char *, unsigned);
-	Memory(char *, char *);
-	Memory(const char *, unsigned);
-	Memory(const char *, const char *);
-private:
-	void init(char *, char *, Mode);
+	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 char *b, const char *e);
 
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
-public:
-	virtual unsigned put(char);
-	virtual bool getline(std::string &);
-	virtual int get();
+	void set_block(bool) override;
+	void set_inherit(bool) override;
 
-	unsigned seek(int, SeekType);
-	unsigned tell() const { return pos-begin; }
+private:
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
+public:
+	std::size_t put(char) override;
+	bool getline(std::string &) override;
+	int get() override;
 
-	virtual Handle get_event_handle();
+	const Handle &get_handle(Mode) override;
 
-private:
-	void check_mode(Mode) const;
+	SeekOffset seek(SeekOffset, SeekType) override;
+	SeekOffset tell() const override { return pos-begin; }
 };
 
 } // namespace IO