From f888fbcff82f30c549a7cccd98191dedcc3101ec Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Fri, 1 Aug 2014 18:49:11 +0200
Subject: [PATCH] remove workarounds for resolved issue 13049 and 13050

---
 src/core/internal/traits.d | 3 +--
 src/core/thread.d          | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/core/internal/traits.d b/src/core/internal/traits.d
index 13268f3bcef..496edf0204e 100644
--- a/src/core/internal/traits.d
+++ b/src/core/internal/traits.d
@@ -60,13 +60,12 @@ template externDFunc(string fqn, T:FT*, FT) if(is(FT == function))
     {
         import core.demangle : mangleFunc;
         enum decl = {
-            string s = "extern(D) RT bug13050(Args)";
+            string s = "extern(D) RT externDFunc(Args)";
             foreach (attr; __traits(getFunctionAttributes, FT))
                 s ~= " " ~ attr;
             return s ~ ";";
         }();
         pragma(mangle, mangleFunc!T(fqn)) mixin(decl);
-        alias externDFunc = bug13050;
     }
     else
         static assert(0);
diff --git a/src/core/thread.d b/src/core/thread.d
index c694d6fe508..a8c0f0aeaa2 100644
--- a/src/core/thread.d
+++ b/src/core/thread.d
@@ -25,11 +25,11 @@ private
     alias rt_tlsgc_destroy = externDFunc!("rt.tlsgc.destroy", void function(void*));
 
     alias ScanDg = void delegate(void* pstart, void* pend) nothrow;
-    alias ScanFunc = void function(void*, scope ScanDg) nothrow; // Bug 13049
-    alias rt_tlsgc_scan = externDFunc!("rt.tlsgc.scan", ScanFunc);
+    alias rt_tlsgc_scan =
+        externDFunc!("rt.tlsgc.scan", void function(void*, scope ScanDg) nothrow);
 
-    alias ProcessFunc = void function(void*, scope IsMarkedDg) nothrow; // Bug 13049
-    alias rt_tlsgc_processGCMarks = externDFunc!("rt.tlsgc.processGCMarks", ProcessFunc);
+    alias rt_tlsgc_processGCMarks =
+        externDFunc!("rt.tlsgc.processGCMarks", void function(void*, scope IsMarkedDg) nothrow);
 }
 
 version( Solaris )