X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=2af56ae67b2264913dcc3fa376ba5cde023c63b5;hp=36f37706a8432b35aed12f8772b9bd3958c7a78b;hb=HEAD;hpb=99b9121e2158603372c7313400283b622e6754d8

diff --git a/source/io/file.h b/source/io/file.h
index 36f3770..2af56ae 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -3,26 +3,24 @@
 
 #include <stdexcept>
 #include <string>
+#include <msp/core/mspcore_api.h>
 #include "buffered.h"
-#include "filtered.h"
 #include "handle.h"
 #include "seekable.h"
 
 namespace Msp {
 namespace IO {
 
-class file_not_found: public std::runtime_error
+class MSPCORE_API file_not_found: public std::runtime_error
 {
 public:
 	file_not_found(const std::string &fn): std::runtime_error(fn) { }
-	virtual ~file_not_found() throw() = default;
 };
 
-class file_already_exists: public std::runtime_error
+class MSPCORE_API file_already_exists: public std::runtime_error
 {
 public:
 	file_already_exists(const std::string &fn): std::runtime_error(fn) { }
-	virtual ~file_already_exists() throw() = default;
 };
 
 
@@ -31,7 +29,7 @@ A class for reading and writing files.
 
 Non-blocking mode is not supported on Win32.
 */
-class File: public Seekable
+class MSPCORE_API File: public Seekable
 {
 public:
 	enum CreateMode
@@ -55,22 +53,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 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 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)
@@ -83,7 +81,7 @@ inline File::CreateMode operator~(File::CreateMode m)
 { return File::CreateMode(~static_cast<int>(m)); }
 
 
-class BufferedFile: public Seekable
+class MSPCORE_API BufferedFile: public Seekable
 {
 private:
 	File file;
@@ -93,22 +91,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 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);
+	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