Merge branch 'master' of git://github.com/jacob-carlborg/orange into …

…unittests_and_release
jmcabo · Nov 27, 2013 · 06ff9ec · 06ff9ec
2 parents 3f76ff5 + 6db4d34
commit 06ff9ec
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/orange/serialization/Serializer.d b/orange/serialization/Serializer.d
@@ -1838,7 +1838,7 @@ class Serializer
 		{
 			static if (m != nonSerializedField)
 			{
-				mixin(`alias getAttributes!(T.` ~ m ~ `) attrs;`);
+				mixin(`alias attrs = Attributes!(m, __traits(getAttributes, T.` ~ m ~ `));`);
 
 				static if (attrs.contains!(event))
 					__traits(getMember, value, m)();

diff --git a/orange/util/Use.d b/orange/util/Use.d
@@ -75,7 +75,8 @@ struct Use (ARGS...)
 	{
 		assert(args[0]);
 
-		static if (NEW_ARGS.length == 1)
+		// Issue: https://d.puremagic.com/issues/show_bug.cgi?id=11614
+		static if (args.length == 1)
 			return args[0](dg);
 
 		else

diff --git a/tests/NonMutable.d b/tests/NonMutable.d
@@ -65,6 +65,13 @@ class A
 A a;
 immutable int ptr = 3;
 
+class CTFEFieldsIssue35
+{
+	public immutable FIRST = 1;
+	public immutable SECOND = 1;
+	public bool someFlag;
+}
+
 unittest
 {
 	archive = new XmlArchive!(char);
@@ -97,4 +104,12 @@ unittest
 			assert(a == aDeserialized);
 		};
 	};
+
+	describe("serializing object with CTFE fields") in {
+		it("should compile") in {
+			assert(__traits(compiles, {
+				serializer.serialize(new CTFEFieldsIssue35);
+			}));
+		};
+	};
 }