From 6ceda934a29eb8c9eb7581d818c106a85ec5c94c Mon Sep 17 00:00:00 2001
From: monarchdodra <monarchdodra@gmail.com>
Date: Sat, 11 Jan 2014 15:59:43 +0100
Subject: [PATCH] Tweak n-ary mixin impelmentations

---
 std/functional.d | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/std/functional.d b/std/functional.d
index b52fb6621..52b187087 100644
--- a/std/functional.d
+++ b/std/functional.d
@@ -42,8 +42,8 @@ template unaryFun(alias fun, string parmName = "a")
     {
         auto unaryFun(ElementType)(auto ref ElementType __a)
         {
-            mixin("alias __a "~parmName~";");
-            mixin("return (" ~ fun ~ ");");
+            mixin("alias " ~ parmName ~ " = __a ;");
+            return mixin(fun);
         }
     }
     else
@@ -97,9 +97,9 @@ template binaryFun(alias fun, string parm1Name = "a",
         auto binaryFun(ElementType1, ElementType2)
             (auto ref ElementType1 __a, auto ref ElementType2 __b)
         {
-            mixin("alias __a "~parm1Name~";");
-            mixin("alias __b "~parm2Name~";");
-            mixin("return (" ~ fun ~ ");");
+            mixin("alias "~parm1Name~" = __a ;");
+            mixin("alias "~parm2Name~" = __b ;");
+            return mixin(fun);
         }
     }
     else