From dc9e937beb1ca02e6b0d7f8d114c4200e22b5c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Sat, 10 Jan 2015 15:08:09 +0000
Subject: [PATCH] VM: vm::iterate_active_callstacks is only used once, so it's
 simpler if the code body is "inline"

---
 vm/code_block_visitor.hpp | 6 +++++-
 vm/vm.hpp                 | 9 ---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/vm/code_block_visitor.hpp b/vm/code_block_visitor.hpp
index 6439629c97..8cd7dab6d2 100644
--- a/vm/code_block_visitor.hpp
+++ b/vm/code_block_visitor.hpp
@@ -95,7 +95,11 @@ void code_block_visitor<Fixup>::visit_embedded_code_pointers(
 template <typename Fixup>
 void code_block_visitor<Fixup>::visit_context_code_blocks() {
   call_frame_code_block_visitor<Fixup> call_frame_visitor(parent, fixup);
-  parent->iterate_active_callstacks(call_frame_visitor, fixup);
+  std::set<context*>::const_iterator begin = parent->active_contexts.begin();
+  std::set<context*>::const_iterator end = parent->active_contexts.end();
+  while (begin != end) {
+    parent->iterate_callstack(*begin++, call_frame_visitor, fixup);
+  }
 }
 
 template <typename Fixup>
diff --git a/vm/vm.hpp b/vm/vm.hpp
index 15ce00b534..f98b210c5f 100644
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -177,15 +177,6 @@ struct factor_vm {
   void primitive_check_datastack();
   void primitive_load_locals();
 
-  template <typename Iterator, typename Fixup>
-  void iterate_active_callstacks(Iterator& iter, Fixup& fixup) {
-    std::set<context*>::const_iterator begin = active_contexts.begin();
-    std::set<context*>::const_iterator end = active_contexts.end();
-    while (begin != end) {
-      iterate_callstack(*begin++, iter, fixup);
-    }
-  }
-
   // run
   void primitive_exit();
   void primitive_nano_count();