Fix #1941 - real fix for the workaround

vibe-d · Mar 2, 2019 · dc8fd00 · dc8fd00
1 parent 419ec62
commit dc8fd00
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/data/vibe/data/serialization.d b/data/vibe/data/serialization.d
@@ -1199,11 +1199,15 @@ private template isBuiltinTuple(T, string member)
 }
 
 // heuristically determines @safe'ty of the serializer by testing readValue and writeValue for type int
-private enum isSafeSerializer(S) = __traits(compiles, (S s) @safe {
+private template isSafeSerializer(S)
+{
 	alias T = Traits!(int, DefaultPolicy);
-	s.writeValue!T(42);
-	s.readValue!(T, int)();
-});
+	static if (__traits(hasMember, S, "writeValue"))
+		enum isSafeSerializer = __traits(compiles, (S s) @safe { s.writeValue!T(42); });
+	else static if (__traits(hasMember, S, "readValue"))
+		enum isSafeSerializer = __traits(compiles, (S s) @safe { s.readValue!(T, int)(); });
+	else static assert(0, "Serializer without writeValue or readValue is invalid");
+}
 
 private template hasAttribute(T, alias decl) { enum hasAttribute = findFirstUDA!(T, decl).found; }