X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fbase.h;h=aadc6acd48db7c49430e4823c74423a354168535;hp=a6a8827c6d4c28ee981806c4284af063b96de8dd;hb=HEAD;hpb=ea8bf8f588310b0d7fd3297d74907602705bba1d

diff --git a/source/io/base.h b/source/io/base.h
index a6a8827..92c860d 100644
--- a/source/io/base.h
+++ b/source/io/base.h
@@ -1,8 +1,11 @@
 #ifndef MSP_IO_BASE_H_
 #define MSP_IO_BASE_H_
 
+#include <cstddef>
 #include <sigc++/sigc++.h>
+#include <msp/core/mspcore_api.h>
 #include <msp/core/mutex.h>
+#include <msp/core/noncopyable.h>
 #include "handle.h"
 #include "mode.h"
 #include "poll.h"
@@ -13,7 +16,7 @@ namespace IO {
 /**
 Common interface for all I/O objects.
 */
-class Base
+class MSPCORE_API Base: private NonCopyable
 {
 public:
 	/** RAII synchronization primitive.  Prevents concurrent access to the
@@ -40,14 +43,11 @@ public:
 	sigc::signal<void> signal_deleted;
 
 protected:
-	Mode mode;
-	bool eof_flag;
-	Mutex *mutex;
+	Mode mode = M_READ;
+	bool eof_flag = false;
+	Mutex *mutex = nullptr;
 
 	Base();
-private:
-	Base(const Base &);
-	Base &operator=(const Base &);
 public:
 	virtual ~Base();
 
@@ -71,25 +71,25 @@ public:
 protected:
 	void check_access(Mode) const;
 
-	virtual unsigned do_write(const char *, unsigned) = 0;
-	virtual unsigned do_read(char *, unsigned) = 0;
+	virtual std::size_t do_write(const char *, std::size_t) = 0;
+	virtual std::size_t do_read(char *, std::size_t) = 0;
 
 public:
 	/** Writes data from a buffer.  Subject to blocking.  Returns the number of
 	bytes written, which may be zero for a non-blockin operation. */
-	unsigned write(const char *b, unsigned c) { return do_write(b, c); }
+	std::size_t write(const char *b, std::size_t c) { return do_write(b, c); }
 
 	/** Writes a string.  This is identical to calling
 	write(s.data(), s.size()). */
-	unsigned write(const std::string &s) { return do_write(s.data(), s.size()); }
+	std::size_t write(const std::string &s) { return do_write(s.data(), s.size()); }
 
 	/** Writes a single character.  This is identical to calling
 	write(&c, 1). */
-	virtual unsigned put(char c) { return do_write(&c, 1); }
+	virtual std::size_t put(char c) { return do_write(&c, 1); }
 
 	/** Reads data into a buffer.  Subject to blocking.  Returns the number of
 	bytes read, which may be zero for a non-blocking operation. */
-	unsigned read(char *b, unsigned c) { return do_read(b, c); }
+	std::size_t read(char *b, std::size_t c) { return do_read(b, c); }
 
 	/** Reads characters up to the next linefeed or end-of-file.  The linefeed
 	is not included in the line.  Returns true if a line was successfully read,