From d21b1b2e1ec5a9756271a52794f3ad860a175c21 Mon Sep 17 00:00:00 2001
From: Phil Dawes <phil@phildawes.net>
Date: Mon, 17 Aug 2009 21:37:17 +0100
Subject: [PATCH] removed global functions from arrays.cpp

---
 vm/arrays.cpp      | 16 ----------------
 vm/arrays.hpp      | 10 ----------
 vm/inlineimpls.hpp |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/vm/arrays.cpp b/vm/arrays.cpp
index 8d964c4d21..62992c4e7c 100644
--- a/vm/arrays.cpp
+++ b/vm/arrays.cpp
@@ -23,10 +23,6 @@ array *factorvm::allot_array(cell capacity, cell fill_)
 	return new_array.untagged();
 }
 
-array *allot_array(cell capacity, cell fill_)
-{
-	return vm->allot_array(capacity,fill_);
-}
 
 /* push a new array on the stack */
 inline void factorvm::vmprim_array()
@@ -49,10 +45,6 @@ cell factorvm::allot_array_1(cell obj_)
 	return a.value();
 }
 
-cell allot_array_1(cell obj_)
-{
-	return vm->allot_array_1(obj_);
-}
 
 cell factorvm::allot_array_2(cell v1_, cell v2_)
 {
@@ -64,10 +56,6 @@ cell factorvm::allot_array_2(cell v1_, cell v2_)
 	return a.value();
 }
 
-cell allot_array_2(cell v1_, cell v2_)
-{
-	return vm->allot_array_2(v1_,v2_);
-}
 
 cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
 {
@@ -83,10 +71,6 @@ cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
 	return a.value();
 }
 
-cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
-{
-	return vm->allot_array_4(v1_,v2_,v3_,v4_);
-}
 
 inline void factorvm::vmprim_resize_array()
 {
diff --git a/vm/arrays.hpp b/vm/arrays.hpp
index 282474ade8..e3eaccfba3 100755
--- a/vm/arrays.hpp
+++ b/vm/arrays.hpp
@@ -10,16 +10,6 @@ inline cell array_nth(array *array, cell slot)
 	return array->data()[slot];
 }
 
-
-
-
-
-array *allot_array(cell capacity, cell fill);
-
-cell allot_array_1(cell obj);
-cell allot_array_2(cell v1, cell v2);
-cell allot_array_4(cell v1, cell v2, cell v3, cell v4);
-
 PRIMITIVE(array);
 PRIMITIVE(resize_array);
 
diff --git a/vm/inlineimpls.hpp b/vm/inlineimpls.hpp
index 241c958b2c..3932177a72 100644
--- a/vm/inlineimpls.hpp
+++ b/vm/inlineimpls.hpp
@@ -347,7 +347,7 @@ struct growable_array {
 	cell count;
 	gc_root<array> elements;
 
-	growable_array(factorvm *myvm, cell capacity = 10) : count(0), elements(allot_array(capacity,F),myvm) {}
+	growable_array(factorvm *myvm, cell capacity = 10) : count(0), elements(myvm->allot_array(capacity,F),myvm) {}
 
 	void add(cell elt);
 	void trim();