Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin' into 1.8.7
Browse files Browse the repository at this point in the history
brixen committed Feb 13, 2015
2 parents 24a8f29 + b47e6ad commit 0654506
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 5 additions & 0 deletions vm/vm.cpp
Original file line number Diff line number Diff line change
@@ -113,6 +113,11 @@ namespace rubinius {
delete vm;
}

void VM::set_zombie() {
thread.set(nil<Thread>());
zombie_ = true;
}

void VM::initialize_as_root() {

om = new ObjectMemory(this, shared.config);
4 changes: 1 addition & 3 deletions vm/vm.hpp
Original file line number Diff line number Diff line change
@@ -149,9 +149,7 @@ namespace rubinius {
return id_;
}

void set_zombie() {
zombie_ = true;
}
void set_zombie();

bool zombie_p() {
return zombie_;

0 comments on commit 0654506

Please sign in to comment.