From 625fe5a61ded59bac6b677208b5cb481b7d587c3 Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Sat, 23 Apr 2011 17:29:10 +0200
Subject: [PATCH] Merged DMD commit 2f861ed4f230519a8b9d22fce01a80ba26feab5f:
 bugzilla 5197 Ddoc: access-attributed auto template function crashes dmd

---
 dmd/doc.c  | 7 ++++++-
 dmd/mars.c | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dmd/doc.c b/dmd/doc.c
index dd3107f4..db0784bb 100644
--- a/dmd/doc.c
+++ b/dmd/doc.c
@@ -835,7 +835,12 @@ void FuncDeclaration::toDocBuffer(OutBuffer *buf)
 
             hgs.ddoc = 1;
             prefix(buf, td);
-            tf->next->toCBuffer(buf, NULL, &hgs);
+            if (tf)
+            {   if (tf->nextOf())
+                    tf->nextOf()->toCBuffer(buf, NULL, &hgs);
+                else
+                    buf->writestring("auto");
+            }
             buf->writeByte(' ');
             buf->writestring(ident->toChars());
             buf->writeByte('(');
diff --git a/dmd/mars.c b/dmd/mars.c
index a90c0930..b27520c4 100644
--- a/dmd/mars.c
+++ b/dmd/mars.c
@@ -59,7 +59,7 @@ Global::Global()
 
     copyright = "Copyright (c) 1999-2010 by Digital Mars and Tomas Lindquist Olsen";
     written = "written by Walter Bright and Tomas Lindquist Olsen";
-    version = "v1.066";
+    version = "v1.067";
     ldc_version = "LDC trunk";
     llvm_version = "LLVM 2.9";
     global.structalign = 8;