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

diff --git a/source/io/file.h b/source/io/file.h
index 85075d0..292897b 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() { }
+	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;
 };
 
 
@@ -61,8 +60,8 @@ public:
 	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();
@@ -97,10 +96,10 @@ public:
 	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();