X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fmemory.h;h=c24d3f78e6ec3c123b7f99736fb858533f66de94;hb=d15b96b498d7cad51a0cb1dd949f70a04af246e9;hp=4a6eca2ab44178636a0fa3016c97910f8834230f;hpb=ea8bf8f588310b0d7fd3297d74907602705bba1d;p=libs%2Fcore.git

diff --git a/source/io/memory.h b/source/io/memory.h
index 4a6eca2..c24d3f7 100644
--- a/source/io/memory.h
+++ b/source/io/memory.h
@@ -9,27 +9,24 @@ namespace IO {
 class Memory: public Seekable
 {
 private:
-	char *begin;
-	char *end;
-	char *pos;
+	char *begin = nullptr;
+	char *end = nullptr;
+	char *pos = nullptr;
 
 public:
-	Memory(char *, unsigned, Mode = M_RDWR);
+	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 *, unsigned);
-	Memory(const char *, const char *);
-private:
-	void init(char *, char *, Mode);
+	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) { }
 
-public:
 	virtual void set_block(bool);
 	virtual void set_inherit(bool);
 
 private:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	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();