X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fmemory.h;h=75cf7f5a6056ff052ebef19b4622692f6bf138d5;hp=048656793d47c33a56de5b1142bb5edbb3c2e4ba;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=122846f0881673770d88eff7d925ecf25c01b62e diff --git a/source/io/memory.h b/source/io/memory.h index 0486567..75cf7f5 100644 --- a/source/io/memory.h +++ b/source/io/memory.h @@ -9,9 +9,9 @@ namespace IO { class Memory: public Seekable { private: - char *begin = 0; - char *end = 0; - char *pos = 0; + char *begin = nullptr; + char *end = nullptr; + char *pos = nullptr; public: Memory(char *d, std::size_t s, Mode m = M_RDWR): Memory(d, d+s, m) { } @@ -19,21 +19,21 @@ public: Memory(const char *d, std::size_t s): Memory(const_cast(d), const_cast(d+s), M_READ) { } Memory(const char *b, const char *e): Memory(const_cast(b), const_cast(e), M_READ) { } - 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