fix variant

9il · 9il · commit 47af0c5dadab · 2020-01-08T19:41:51.000+07:00
diff --git a/source/mir/variant.d b/source/mir/variant.d
@@ -165,7 +165,7 @@ template visit(alias visitor, bool forceAllTypes = true)
                 else
                     assert(0, variantNulllExceptionMsg);
             static foreach (i, T; V._Types)
-            static if (forceAllTypes || __traits(compiles, { return visitor(variant.trustedGet!T, forward!args); }))
+            static if (forceAllTypes || __traits(compiles, visitor(variant.trustedGet!T, forward!args)))
             {
                 case i + 1:
                     return visitor(variant.trustedGet!T, forward!args);
@@ -197,7 +197,7 @@ template optionalVisit(alias visitor)
         switch (variant.type)
         {
             static foreach (i, T; V._Types)
-            static if (__traits(compiles, { result = visitor(variant.trustedGet!T, forward!args); }))
+            static if (__traits(compiles, result = visitor(variant.trustedGet!T, forward!args)))
             {
                 case i + 1:
                     result = visitor(variant.trustedGet!T, forward!args);

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ template visit(alias visitor, bool forceAllTypes = true)`
`165`	`165`	`else`
`166`	`166`	`assert(0, variantNulllExceptionMsg);`
`167`	`167`	`static foreach (i, T; V._Types)`
`168`		`- static if (forceAllTypes \|\| __traits(compiles, { return visitor(variant.trustedGet!T, forward!args); }))`
	`168`	`+ static if (forceAllTypes \|\| __traits(compiles, visitor(variant.trustedGet!T, forward!args)))`
`169`	`169`	`{`
`170`	`170`	`case i + 1:`
`171`	`171`	`return visitor(variant.trustedGet!T, forward!args);`
`@@ -197,7 +197,7 @@ template optionalVisit(alias visitor)`
`197`	`197`	`switch (variant.type)`
`198`	`198`	`{`
`199`	`199`	`static foreach (i, T; V._Types)`
`200`		`- static if (__traits(compiles, { result = visitor(variant.trustedGet!T, forward!args); }))`
	`200`	`+ static if (__traits(compiles, result = visitor(variant.trustedGet!T, forward!args)))`
`201`	`201`	`{`
`202`	`202`	`case i + 1:`
`203`	`203`	`result = visitor(variant.trustedGet!T, forward!args);`