X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=36f37706a8432b35aed12f8772b9bd3958c7a78b;hb=99b9121e2158603372c7313400283b622e6754d8;hp=ececa8dc19c28f53d2e690db06af481a81555e52;hpb=481b844ed7d180ffbf70223075f2fc1ffdb5b444;p=libs%2Fcore.git diff --git a/source/io/file.h b/source/io/file.h index ececa8d..36f3770 100644 --- a/source/io/file.h +++ b/source/io/file.h @@ -15,14 +15,14 @@ class file_not_found: public std::runtime_error { public: file_not_found(const std::string &fn): std::runtime_error(fn) { } - ~file_not_found() throw() { } + virtual ~file_not_found() throw() = default; }; class file_already_exists: public std::runtime_error { public: file_already_exists(const std::string &fn): std::runtime_error(fn) { } - ~file_already_exists() throw() { } + virtual ~file_already_exists() throw() = default; }; @@ -58,10 +58,11 @@ public: virtual ~File(); virtual void set_block(bool); + virtual void set_inherit(bool); protected: - 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 void sync(); @@ -93,12 +94,13 @@ public: BufferedFile(const std::string &, Mode = M_READ, File::CreateMode = File::C_OVERWRITE); virtual void set_block(bool); + virtual void set_inherit(bool); protected: - 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();