1444

3 files changed, 9 insertions, 5 deletions

diff --git a/035call.cc b/035call.cc
index 0a783b97..91609312 100644
--- a/035call.cc
+++ b/035call.cc
@@ -37,7 +37,11 @@ struct call {
   recipe_number running_recipe;
   long long int running_step_index;
   // End call Fields
-  call(recipe_number r) :running_recipe(r), running_step_index(0) {}
+  call(recipe_number r) {
+    running_recipe = r;
+    running_step_index = 0;
+    // End call Constructor
+  }
 };
 typedef list<call> call_stack;
 
diff --git a/036call_ingredient.cc b/036call_ingredient.cc
index b829a772..fd78ce94 100644
--- a/036call_ingredient.cc
+++ b/036call_ingredient.cc
@@ -23,8 +23,8 @@ recipe f [
 :(before "End call Fields")
 vector<vector<double> > ingredient_atoms;
 long long int next_ingredient_to_process;
-:(replace{} "call(recipe_number r)")
-call(recipe_number r) :running_recipe(r), running_step_index(0), next_ingredient_to_process(0) {}
+:(before "End call Constructor")
+next_ingredient_to_process = 0;
 
 :(replace "Current_routine->calls.push_front(call(current_instruction().operation))" following "End Primitive Recipe Implementations")
 call callee(current_instruction().operation);
diff --git a/043space.cc b/043space.cc
index e1100f89..37117439 100644
--- a/043space.cc
+++ b/043space.cc
@@ -42,8 +42,8 @@ if (s == "default-space") return true;
 //:: now implement space support
 :(before "End call Fields")
 long long int default_space;
-:(replace "call(recipe_number r) :running_recipe(r)")
-call(recipe_number r) :running_recipe(r), running_step_index(0), next_ingredient_to_process(0), default_space(0) {}
+:(before "End call Constructor")
+default_space = 0;
 
 :(replace "reagent r = x" following "reagent canonize(reagent x)")
 reagent r = absolutize(x);