From 340ad8b8d9aca808726265bab0a643b5675c9c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Fri, 13 May 2016 03:22:13 +0200 Subject: [PATCH] VM: removes the delete_contexts method --- vm/contexts.cpp | 7 ------- vm/vm.cpp | 5 ++++- vm/vm.hpp | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/vm/contexts.cpp b/vm/contexts.cpp index c504da64f2..2608d6c09a 100644 --- a/vm/contexts.cpp +++ b/vm/contexts.cpp @@ -94,13 +94,6 @@ void factor_vm::init_contexts(cell datastack_size_, cell retainstack_size_, spare_ctx = new_context(); } -void factor_vm::delete_contexts() { - FACTOR_ASSERT(!ctx); - FACTOR_FOR_EACH(unused_contexts) { - delete *iter; - } -} - context* factor_vm::new_context() { context* new_context; diff --git a/vm/vm.cpp b/vm/vm.cpp index 75058e7ec7..0fc40c78a3 100644 --- a/vm/vm.cpp +++ b/vm/vm.cpp @@ -27,7 +27,10 @@ factor_vm::factor_vm(THREADHANDLE thread) } factor_vm::~factor_vm() { - delete_contexts(); + FACTOR_ASSERT(!ctx); + FACTOR_FOR_EACH(unused_contexts) { + delete *iter; + } if (signal_callstack_seg) { delete signal_callstack_seg; signal_callstack_seg = NULL; diff --git a/vm/vm.hpp b/vm/vm.hpp index 9209ae9e08..d21172ea1b 100644 --- a/vm/vm.hpp +++ b/vm/vm.hpp @@ -154,7 +154,6 @@ struct factor_vm { void delete_context(); void init_contexts(cell datastack_size_, cell retainstack_size_, cell callstack_size_); - void delete_contexts(); cell begin_callback(cell quot); void end_callback(); void primitive_current_callback();