Use nullptr instead of 0 for pointers

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

diff --git a/source/io/memory.h b/source/io/memory.h
index ebd57eda09d1af492d32df338737edac7eb98fc1..c24d3f78e6ec3c123b7f99736fb858533f66de94 100644 (file)
--- a/source/io/memory.h
+++ b/source/io/memory.h
@@ -9,30 +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 *, 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();
 
-       virtual unsigned seek(int, SeekType);
-       virtual unsigned tell() const { return pos-begin; }
+       virtual const Handle &get_handle(Mode);
 
-private:
-       void check_mode(Mode) const;
+       virtual SeekOffset seek(SeekOffset, SeekType);
+       virtual SeekOffset tell() const { return pos-begin; }
 };
 
 } // namespace IO