X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fmemory.cpp;h=4a6296b44a907321a5e04a585e229523ff7caf86;hb=a27ea413e861a30c61b29d77d58ea3d15a9de6a1;hp=6ea130b54ae134478ab40851f4c49cf1d68ad439;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index 6ea130b..4a6296b 100644
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cstring>
-#include "except.h"
+#include "handle.h"
 #include "memory.h"
 
 using namespace std;
@@ -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)
@@ -98,29 +98,19 @@ unsigned Memory::seek(int off, SeekType type)
 	else if(type==S_END)
 		new_pos = end+off;
 	else
-		throw InvalidParameterValue("Invalid seek type");
+		throw invalid_argument("Memory::seek");
 
 	if(new_pos<begin || new_pos>end)
-		throw InvalidParameterValue("Invalid seek offset");
+		throw out_of_range("Memory::seek");
 
 	pos = new_pos;
 	return pos-begin;
 }
 
-Handle Memory::get_event_handle()
-{
-	throw Exception("Memory doesn't support events");
-}
-
 void Memory::check_mode(Mode m) const
 {
-	if(m==M_WRITE)
-	{
-		if(!(mode&M_WRITE))
-			throw InvalidState("Memory is not writable");
-		if(pos==end)
-			throw InvalidState("Attempt to write past end of Memory");
-	}
+	if(m==M_WRITE && !(mode&M_WRITE))
+		throw invalid_access(M_WRITE);
 }
 
 } // namespace IO