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

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index 616150f..0539fdb 100644
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cstring>
+#include <msp/core/except.h>
 #include "handle.h"
 #include "memory.h"
 
@@ -8,43 +9,34 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-Memory::Memory(char *d, size_t s, Mode m)
-{
-	init(d, d+s, m);
-}
+Memory::Memory(char *d, std::size_t s, Mode m):
+	Memory(d, d+s, m)
+{ }
 
-Memory::Memory(char *b, char *e, Mode m)
+Memory::Memory(char *b, char *e, Mode m):
+	begin(b),
+	end(e),
+	pos(begin)
 {
-	init(b, e, m);
+	mode = m;
 }
 
-Memory::Memory(const char *cd, size_t s)
-{
-	char *d = const_cast<char *>(cd);
-	init(d, d+s, M_READ);
-}
+Memory::Memory(const char *d, std::size_t s):
+	Memory(const_cast<char *>(d), const_cast<char *>(d+s), M_READ)
+{ }
 
-Memory::Memory(const char *b, const char *e)
-{
-	init(const_cast<char *>(b), const_cast<char *>(e), M_READ);
-}
-
-void Memory::init(char *b, char *e, Mode m)
-{
-	begin = b;
-	end = e;
-	pos = begin;
-	mode = m;
-}
+Memory::Memory(const char *b, const char *e):
+	Memory(const_cast<char *>(b), const_cast<char *>(e), M_READ)
+{ }
 
 void Memory::set_block(bool)
 {
-	throw logic_error("Memory::set_block");
+	throw unsupported("Memory::set_block");
 }
 
 void Memory::set_inherit(bool)
 {
-	throw logic_error("Memory::set_inherit");
+	throw unsupported("Memory::set_inherit");
 }
 
 size_t Memory::do_write(const char *buf, size_t size)
@@ -115,7 +107,7 @@ int Memory::get()
 
 const Handle &Memory::get_handle(Mode)
 {
-	throw logic_error("Memory::get_handle");
+	throw unsupported("Memory::get_handle");
 }
 
 SeekOffset Memory::seek(SeekOffset off, SeekType type)