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

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