Mercurial > projects > orange

changeset 15:9f6064f9505a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed from archive to serializer in the register wrappers.
author Jacob Carlborg <doob@me.com>
date Sun, 08 Aug 2010 21:26:11 +0200
parents 6e454595b203
children 091ff1b263db
files orange/serialization/RegisterWrapper.d orange/serialization/Serializer.d
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/orange/serialization/RegisterWrapper.d	Sun Aug 08 21:24:11 2010 +0200
+++ b/orange/serialization/RegisterWrapper.d	Sun Aug 08 21:26:11 2010 +0200
@@ -14,9 +14,8 @@
 	
 }
 
-class SerializeRegisterWrapper (T, ArchiveType : IArchive) : RegisterBase
+class SerializeRegisterWrapper (T, SerializerType) : RegisterBase
 {
-	private alias Serializer!(ArchiveType) SerializerType;
 	private alias SerializerType.DataType DataType;
 	private void delegate (T, SerializerType, DataType) dg;
 	private bool isDelegate;
@@ -42,9 +41,8 @@
 	}
 }
 
-class DeserializeRegisterWrapper (T, ArchiveType : IArchive) : RegisterBase
+class DeserializeRegisterWrapper (T, SerializerType) : RegisterBase
 {
-	private alias Serializer!(ArchiveType) SerializerType;
 	private alias SerializerType.DataType DataType;
 	private void delegate (ref T, SerializerType, DataType) dg;
 	private bool isDelegate;
--- a/orange/serialization/Serializer.d	Sun Aug 08 21:24:11 2010 +0200
+++ b/orange/serialization/Serializer.d	Sun Aug 08 21:26:11 2010 +0200
@@ -493,9 +493,9 @@
 		}
 	}
 	
-	private SerializeRegisterWrapper!(T, ArchiveType) getSerializerWrapper (T) (string type)
+	private SerializeRegisterWrapper!(T, Serializer) getSerializerWrapper (T) (string type)
 	{
-		auto wrapper = cast(SerializeRegisterWrapper!(T, ArchiveType)) serializers[type];
+		auto wrapper = cast(SerializeRegisterWrapper!(T, Serializer)) serializers[type];
 		
 		if (wrapper)
 			return wrapper;
@@ -503,9 +503,9 @@
 		assert(false, "throw exception here");
 	}
 
-	private DeserializeRegisterWrapper!(T, ArchiveType) getDeserializerWrapper (T) (string type)
+	private DeserializeRegisterWrapper!(T, Serializer) getDeserializerWrapper (T) (string type)
 	{
-		auto wrapper = cast(DeserializeRegisterWrapper!(T, ArchiveType)) deserializers[type];
+		auto wrapper = cast(DeserializeRegisterWrapper!(T, Serializer)) deserializers[type];
 		
 		if (wrapper)
 			return wrapper;