about summary refs log tree commit diff stats
path: root/035call_ingredient.cc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-03-13 20:26:47 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-03-13 20:26:47 -0700
commitb24eb4766ad12eceaafa2ee0d620e070e21a3293 (patch)
treed7efc84bce7cf75fa18792d02bceb15480690a2d /035call_ingredient.cc
parent95b2a140094697dec176167154f9b3b31c2ef70f (diff)
downloadmu-b24eb4766ad12eceaafa2ee0d620e070e21a3293.tar.gz
2773 - switch to 'int'
This should eradicate the issue of 2771.
Diffstat (limited to '035call_ingredient.cc')
-rw-r--r--035call_ingredient.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/035call_ingredient.cc b/035call_ingredient.cc
index 63fa7a62..10672548 100644
--- a/035call_ingredient.cc
+++ b/035call_ingredient.cc
@@ -23,12 +23,12 @@ def f [
 :(before "End call Fields")
 vector<vector<double> > ingredient_atoms;
 vector<reagent> ingredients;
-long long int next_ingredient_to_process;
+int next_ingredient_to_process;
 :(before "End call Constructor")
 next_ingredient_to_process = 0;
 
 :(before "End Call Housekeeping")
-for (long long int i = 0; i < SIZE(ingredients); ++i) {
+for (int i = 0; i < SIZE(ingredients); ++i) {
   current_call().ingredient_atoms.push_back(ingredients.at(i));
   reagent ingredient = call_instruction.ingredients.at(i);
   canonize_type(ingredient);
@@ -76,8 +76,8 @@ case NEXT_INGREDIENT: {
     if (current_instruction().products.empty()) break;
     products.resize(2);
     // pad the first product with sufficient zeros to match its type
-    long long int size = size_of(current_instruction().products.at(0));
-    for (long long int i = 0; i < size; ++i)
+    int size = size_of(current_instruction().products.at(0));
+    for (int i = 0; i < size; ++i)
       products.at(0).push_back(0);
     products.at(1).push_back(0);
   }
@@ -152,7 +152,7 @@ case INGREDIENT: {
 }
 :(before "End Primitive Recipe Implementations")
 case INGREDIENT: {
-  if (static_cast<long long int>(ingredients.at(0).at(0)) < SIZE(current_call().ingredient_atoms)) {
+  if (static_cast<int>(ingredients.at(0).at(0)) < SIZE(current_call().ingredient_atoms)) {
     current_call().next_ingredient_to_process = ingredients.at(0).at(0);
     products.push_back(
         current_call().ingredient_atoms.at(current_call().next_ingredient_to_process));