Use size_t for sizes in I/O classes

[libs/core.git] / source / io / memory.cpp

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index c5aee1e0536e040e72187172b2c084269596cce9..616150f0ab72937e40989ae19dcdd401d5a95981 100644 (file)
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-Memory::Memory(char *d, unsigned s, Mode m)
+Memory::Memory(char *d, size_t s, Mode m)
 {
        init(d, d+s, m);
 }
@@ -18,7 +18,7 @@ Memory::Memory(char *b, char *e, Mode m)
        init(b, e, m);
 }
 
-Memory::Memory(const char *cd, unsigned s)
+Memory::Memory(const char *cd, size_t s)
 {
        char *d = const_cast<char *>(cd);
        init(d, d+s, M_READ);
@@ -42,17 +42,22 @@ void Memory::set_block(bool)
        throw logic_error("Memory::set_block");
 }
 
-unsigned Memory::do_write(const char *buf, unsigned size)
+void Memory::set_inherit(bool)
+{
+       throw logic_error("Memory::set_inherit");
+}
+
+size_t Memory::do_write(const char *buf, size_t size)
 {
        check_access(M_WRITE);
 
-       size = min<unsigned>(size, end-pos);
+       size = min<size_t>(size, end-pos);
        memcpy(pos, buf, size);
        pos += size;
        return size;
 }
 
-unsigned Memory::do_read(char *buf, unsigned size)
+size_t Memory::do_read(char *buf, size_t size)
 {
        check_access(M_READ);
 
@@ -62,13 +67,13 @@ unsigned Memory::do_read(char *buf, unsigned size)
                return 0;
        }
 
-       size = min<unsigned>(size, end-pos);
+       size = min<size_t>(size, end-pos);
        memcpy(buf, pos, size);
        pos += size;
        return size;
 }
 
-unsigned Memory::put(char c)
+size_t Memory::put(char c)
 {
        check_access(M_WRITE);