Merge pull request #917 from MartinNowak/removeWorkarounds

remove workarounds for resolved issue 13049 and 13050
dlang · Aug 1, 2014 · cb512c2 · cb512c2
2 parents 4fabf7d + f888fbc
commit cb512c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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 )