Use default member initializers and constructor delegation

[libs/core.git] / source / io / memory.h

diff --git a/source/io/memory.h b/source/io/memory.h
index 4a6eca2ab44178636a0fa3016c97910f8834230f..048656793d47c33a56de5b1142bb5edbb3c2e4ba 100644 (file)
--- 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 = 0;
+       char *end = 0;
+       char *pos = 0;
 
 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();