Mercurial > projects > orange
changeset 17:c4e7e64ffb67
Changed toData/fromData to take an instance of the serializer instead of the archive.
author | Jacob Carlborg <doob@me.com> |
---|---|
date | Sun, 08 Aug 2010 21:59:59 +0200 |
parents | 091ff1b263db |
children | 3d42ea434d46 |
files | orange/serialization/Serializer.d orange/util/Traits.d |
diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/orange/serialization/Serializer.d Sun Aug 08 21:27:10 2010 +0200 +++ b/orange/serialization/Serializer.d Sun Aug 08 21:59:59 2010 +0200 @@ -149,7 +149,7 @@ wrapper(value, this, key); } - else static if (isSerializable!(T, ArchiveType)) + else static if (isSerializable!(T, Serializer)) value.toData(this, key); else @@ -177,7 +177,7 @@ else { - static if (isSerializable!(T, ArchiveType)) + static if (isSerializable!(T, Serializer)) value.toData(this, key); else @@ -217,7 +217,7 @@ wrapper(value, this, key); } - else static if (isSerializable!(T, ArchiveType)) + else static if (isSerializable!(T, Serializer)) value.toData(this, key); else @@ -316,7 +316,7 @@ wrapper(value, this, key); } - else static if (isSerializable!(T, ArchiveType)) + else static if (isSerializable!(T, Serializer)) value.fromData(this, key); else @@ -348,7 +348,7 @@ else { - static if (isSerializable!(T, ArchiveType)) + static if (isSerializable!(T, Serializer)) value.fromData(this, key); else @@ -394,7 +394,7 @@ wrapper(value, this, key); } - else static if (isSerializable!(T, ArchiveType)) + else static if (isSerializable!(T, Serializer)) value.fromData(this, key); else
--- a/orange/util/Traits.d Sun Aug 08 21:27:10 2010 +0200 +++ b/orange/util/Traits.d Sun Aug 08 21:59:59 2010 +0200 @@ -190,9 +190,9 @@ } -template isSerializable (T, ArchiveType) +template isSerializable (T, SerializerType) { - const isSerializable = is(typeof(T.toData(ArchiveType.init, ArchiveType.DataType.init))) && is(typeof(T.fromData(ArchiveType.init, ArchiveType.DataType.init))); + const isSerializable = is(typeof(T.toData(SerializerType.init, SerializerType.DataType.init))) && is(typeof(T.fromData(SerializerType.init, SerializerType.DataType.init))); } template isISerializable (T)