X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=f23cc93e7d013b71dc33cbe060cd83ce939fbe4a;hp=85075d0cca6e8709db663012ced369dd5f0cda52;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=ea8bf8f588310b0d7fd3297d74907602705bba1d

diff --git a/source/io/file.h b/source/io/file.h
index 85075d0..f23cc93 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -4,7 +4,6 @@
 #include <stdexcept>
 #include <string>
 #include "buffered.h"
-#include "filtered.h"
 #include "handle.h"
 #include "seekable.h"
 
@@ -15,14 +14,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() { }
+	~file_not_found() throw() override = 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() { }
+	~file_already_exists() throw() override = default;
 };
 
 
@@ -55,22 +54,22 @@ public:
 private:
 	void platform_init(const std::string &, CreateMode);
 public:
-	virtual ~File();
+	~File() override;
 
-	virtual void set_block(bool);
-	virtual void set_inherit(bool);
+	void set_block(bool) override;
+	void set_inherit(bool) override;
 
 protected:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 
 public:
-	virtual void sync();
+	void sync();
 
-	virtual SeekOffset seek(SeekOffset, SeekType);
-	virtual SeekOffset tell() const;
+	SeekOffset seek(SeekOffset, SeekType) override;
+	SeekOffset tell() const override;
 
-	virtual const Handle &get_handle(Mode);
+	const Handle &get_handle(Mode) override;
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)
@@ -93,22 +92,22 @@ private:
 public:
 	BufferedFile(const std::string &, Mode = M_READ, File::CreateMode = File::C_OVERWRITE);
 
-	virtual void set_block(bool);
-	virtual void set_inherit(bool);
+	void set_block(bool) override;
+	void set_inherit(bool) override;
 
 protected:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 public:
-	virtual unsigned put(char);
+	std::size_t put(char) override;
 
-	virtual bool getline(std::string &);
-	virtual int get();
+	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 position; }
+	SeekOffset seek(SeekOffset, SeekType) override;
+	SeekOffset tell() const override { return position; }
 };
 
 } // namespace IO