gc_swap minor updates

dlang · Jun 23, 2016 · d44dcdb · d44dcdb
1 parent d723362
commit d44dcdb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/src/gc/gcinterface.d b/src/gc/gcinterface.d
@@ -1,28 +1,26 @@
 /**
  * Contains the internal GC interface.
  *
- * Copyright: Copyright Digital Mars 2005 - 2016.
+ * Copyright: Copyright Digital Mars 2016.
  * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jeremy DeHaan
  */
 
- /*          Copyright Digital Mars 2005 - 2016.
+ /*          Copyright Digital Mars 2016.
  * Distributed under the Boost Software License, Version 1.0.
  *    (See accompanying file LICENSE or copy at
  *          http://www.boost.org/LICENSE_1_0.txt)
  */
 module gc.gcinterface;
 import gc.stats;
 
-private
-{
-    static import core.memory;
+static import core.memory;
+alias BlkAttr = core.memory.GC.BlkAttr;
+alias BlkInfo = core.memory.GC.BlkInfo;
 
-    alias BlkInfo = core.memory.GC.BlkInfo;
+alias RootIterator = int delegate(scope int delegate(ref Root) nothrow dg);
+alias RangeIterator = int delegate(scope int delegate(ref Range) nothrow dg);
 
-    alias RootIterator = int delegate(scope int delegate(ref Root) nothrow dg);
-    alias RangeIterator = int delegate(scope int delegate(ref Range) nothrow dg);
-}
 
 struct Root
 {

diff --git a/src/gc/impl/conservative/gc.d b/src/gc/impl/conservative/gc.d
@@ -50,16 +50,6 @@ import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
 import core.stdc.string : memcpy, memset, memmove;
 import core.bitop;
 import core.thread;
-static import core.memory;
-
-private
-{
-    alias BlkAttr = core.memory.GC.BlkAttr;
-    alias BlkInfo = core.memory.GC.BlkInfo;
-
-    alias RootIterator = int delegate(scope int delegate(ref Root) nothrow dg);
-    alias RangeIterator = int delegate(scope int delegate(ref Range) nothrow dg);
-}
 
 version (GNU) import gcc.builtins;
 

diff --git a/src/gc/impl/manual/gc.d b/src/gc/impl/manual/gc.d
@@ -31,16 +31,6 @@ import gc.gcinterface;
 
 import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
 
-static import core.memory;
-
-private
-{
-    alias BlkAttr = core.memory.GC.BlkAttr;
-    alias BlkInfo = core.memory.GC.BlkInfo;
-    alias RootIterator = int delegate(scope int delegate(ref Root) nothrow dg);
-    alias RangeIterator = int delegate(scope int delegate(ref Range) nothrow dg);
-}
-
 extern (C) void onOutOfMemoryError(void* pretend_sideffect = null) @trusted pure nothrow @nogc; /* dmd @@@BUG11461@@@ */
 
 __gshared ManualGC instance;