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

diff --git a/source/io/memory.h b/source/io/memory.h
index 27fd6cb..5b9961c 100644
--- a/source/io/memory.h
+++ b/source/io/memory.h
@@ -14,27 +14,29 @@ private:
 	char *pos;
 
 public:
-	Memory(char *, unsigned);
-	Memory(char *, char *);
-	Memory(const char *, unsigned);
+	Memory(char *, std::size_t, Mode = M_RDWR);
+	Memory(char *, char *, Mode = M_RDWR);
+	Memory(const char *, std::size_t);
 	Memory(const char *, const char *);
 private:
 	void init(char *, char *, Mode);
 
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
 public:
-	virtual unsigned put(char);
+	virtual void set_block(bool);
+	virtual void set_inherit(bool);
+
+private:
+	virtual std::size_t do_write(const char *, std::size_t);
+	virtual std::size_t do_read(char *, std::size_t);
+public:
+	virtual std::size_t put(char);
 	virtual bool getline(std::string &);
 	virtual int get();
 
-	virtual unsigned seek(int, SeekType);
-	virtual 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