X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fmemory.cpp;fp=source%2Fio%2Fmemory.cpp;h=616150f0ab72937e40989ae19dcdd401d5a95981;hp=eaaaeb1829dfc5a59b481ca32e6e48170a78cc53;hb=c8bf2d6c15893ccc9dbc4e04611b7229029f4808;hpb=817e584903996a041692640720a5a272d847a3c7

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index eaaaeb1..616150f 100644
--- 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);
@@ -47,17 +47,17 @@ void Memory::set_inherit(bool)
 	throw logic_error("Memory::set_inherit");
 }
 
-unsigned Memory::do_write(const char *buf, unsigned size)
+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);
 
@@ -67,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);