about summary refs log tree commit diff
path: root/src/librustrt
diff options
context:
space:
mode:
authorKeegan McAllister <kmcallister@mozilla.com>2014-09-26 19:54:27 -0700
committerKeegan McAllister <kmcallister@mozilla.com>2014-09-26 19:54:27 -0700
commitf8a180b36ed4d048dbbb88037c3f35afab6b64ff (patch)
treed0434f4c9a9a93dcf251781adf634901b8198b60 /src/librustrt
parent5d653c17a656e8fe1572c7a695e33b188eda0597 (diff)
downloadrust-f8a180b36ed4d048dbbb88037c3f35afab6b64ff.tar.gz
rust-f8a180b36ed4d048dbbb88037c3f35afab6b64ff.zip
Rename raw::Box to raw::GcBox
Fixes #17470.
Diffstat (limited to 'src/librustrt')
-rw-r--r--src/librustrt/local_heap.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustrt/local_heap.rs b/src/librustrt/local_heap.rs
index fe377d9e75b..0e84e9c0097 100644
--- a/src/librustrt/local_heap.rs
+++ b/src/librustrt/local_heap.rs
@@ -24,7 +24,7 @@ use task::Task;
 
 static RC_IMMORTAL : uint = 0x77777777;
 
-pub type Box = raw::Box<()>;
+pub type Box = raw::GcBox<()>;
 
 pub struct MemoryRegion {
     live_allocations: uint,
@@ -32,7 +32,7 @@ pub struct MemoryRegion {
 
 pub struct LocalHeap {
     memory_region: MemoryRegion,
-    live_allocs: *mut raw::Box<()>,
+    live_allocs: *mut raw::GcBox<()>,
 }
 
 impl LocalHeap {
@@ -161,7 +161,7 @@ impl LocalHeap {
     }
 
     unsafe fn each_live_alloc(&mut self, read_next_before: bool,
-                              f: |&mut LocalHeap, alloc: *mut raw::Box<()>|) {
+                              f: |&mut LocalHeap, alloc: *mut raw::GcBox<()>|) {
         //! Walks the internal list of allocations
 
         let mut alloc = self.live_allocs;