From 16de0e1ca1c91cdb85d2f257945d92e80ff8d1a4 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 21 Apr 2014 15:35:26 -0700
Subject: [PATCH] Fixed bad merge

---
 stdx/d/ast.d | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stdx/d/ast.d b/stdx/d/ast.d
index 29e8b28..efbea86 100644
--- a/stdx/d/ast.d
+++ b/stdx/d/ast.d
@@ -1223,8 +1223,9 @@ final class Destructor : ASTNode
 public:
     override void accept(ASTVisitor visitor) const
     {
-        mixin (visitIfNotNull!(functionBody));
+        mixin (visitIfNotNull!(memberFunctionAttributes, functionBody));
     }
+	/** */ MemberFunctionAttribute[] memberFunctionAttributes;
     /** */ FunctionBody functionBody;
     /** */ size_t location;
     /** */ string comment;
@@ -2052,11 +2053,13 @@ final class NonVoidInitializer : ASTNode
 public:
     override void accept(ASTVisitor visitor) const
     {
-        mixin (visitIfNotNull!(assignExpression, arrayInitializer, structInitializer));
+        mixin (visitIfNotNull!(assignExpression, arrayInitializer,
+            structInitializer, functionBody));
     }
     /** */ AssignExpression assignExpression;
     /** */ ArrayInitializer arrayInitializer;
     /** */ StructInitializer structInitializer;
+    /** */ FunctionBody functionBody;
 
     mixin OpEquals;
 }