X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fmemory.cpp;h=6ccf84654764cbe8086a3ac841330580d302dcd1;hb=df5ab3d867c51d72344e443e3adb05bfa29a2b53;hp=af6ef3d44ce386ce2bd7d2caaf8b1a8de24a9fa7;hpb=c21ab7e49852585df01b4cc19599e25a918b581b;p=libs%2Fcore.git

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index af6ef3d..6ccf846 100644
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -39,7 +39,7 @@ void Memory::init(char *b, char *e, Mode m)
 
 unsigned Memory::do_write(const char *buf, unsigned size)
 {
-	check_mode(M_WRITE);
+	check_access(M_WRITE);
 
 	size = min<unsigned>(size, end-pos);
 	memcpy(pos, buf, size);
@@ -63,7 +63,7 @@ unsigned Memory::do_read(char *buf, unsigned size)
 
 unsigned Memory::put(char c)
 {
-	check_mode(M_WRITE);
+	check_access(M_WRITE);
 	*pos++ = c;
 	return 1;
 }
@@ -88,7 +88,7 @@ int Memory::get()
 	return static_cast<unsigned char>(*pos++);
 }
 
-unsigned Memory::seek(int off, SeekType type)
+SeekOffset Memory::seek(SeekOffset off, SeekType type)
 {
 	char *new_pos;
 	if(type==S_BEG)
@@ -107,11 +107,5 @@ unsigned Memory::seek(int off, SeekType type)
 	return pos-begin;
 }
 
-void Memory::check_mode(Mode m) const
-{
-	if(m==M_WRITE && !(mode&M_WRITE))
-		throw invalid_access(M_WRITE);
-}
-
 } // namespace IO
 } // namespace Msp