moved byte_arrays.hpp inline functions to vm.hpp

diff --git a/vm/byte_arrays.hpp b/vm/byte_arrays.hpp
index 68b706be7b82b974c06100dccf8b0349b6731c35..4954f31094218b9a86edea0130611baa984852cf 100755 (executable)
--- a/vm/byte_arrays.hpp
+++ b/vm/byte_arrays.hpp
@@ -7,16 +7,5 @@ PRIMITIVE(byte_array);
 PRIMITIVE(uninitialized_byte_array);
 PRIMITIVE(resize_byte_array);
 
-struct growable_byte_array {
-       cell count;
-       gc_root<byte_array> elements;
-
-       growable_byte_array(factorvm *vm,cell capacity = 40) : count(0), elements(allot_byte_array(capacity),vm) { }
-
-       void append_bytes(void *elts, cell len);
-       void append_byte_array(cell elts);
-
-       void trim();
-};
 
 }

diff --git a/vm/master.hpp b/vm/master.hpp
index 98ed043e05cb7ee0af33d6d8b8902d9e10cf87fa..0eb51e72304c99701795fb5a92f710b19ad7e993 100755 (executable)
--- a/vm/master.hpp
+++ b/vm/master.hpp
@@ -54,11 +54,11 @@
 #include "generic_arrays.hpp"
 #include "debug.hpp"
 #include "arrays.hpp"
-#include "vm.hpp"
 #include "strings.hpp"
 #include "booleans.hpp"
 #include "byte_arrays.hpp"
 #include "tuples.hpp"
+#include "vm.hpp"
 #include "words.hpp"
 #include "math.hpp"
 #include "float_bits.hpp"

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 0ccb86b9701a097cdccb1d3c081a7e7f5b33d212..b185a1600e8537fe2db033e3a5aa630486a9fd25 100644 (file)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -929,6 +929,19 @@ struct growable_array {
        void trim();
 };
 
+//byte_arrays.hpp
+struct growable_byte_array {
+       cell count;
+       gc_root<byte_array> elements;
+
+       growable_byte_array(factorvm *vm,cell capacity = 40) : count(0), elements(allot_byte_array(capacity),vm) { }
+
+       void append_bytes(void *elts, cell len);
+       void append_byte_array(cell elts);
+
+       void trim();
+};
+
 // next method here: