X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fmemory.h;h=75cf7f5a6056ff052ebef19b4622692f6bf138d5;hp=5b9961c9a38728f7357fc1741e379c593589afdd;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=c8bf2d6c15893ccc9dbc4e04611b7229029f4808

diff --git a/source/io/memory.h b/source/io/memory.h
index 5b9961c..75cf7f5 100644
--- a/source/io/memory.h
+++ b/source/io/memory.h
@@ -9,34 +9,31 @@ 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 *, std::size_t, 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 *, std::size_t);
-	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);
+	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