[lmi-commits] [lmi] master 5ab5e6f 2/3: Rename an enumerator

[Greg Chicares]

branch: master
commit 5ab5e6ffaef3a4b482055a67c9adfcb0560c8b91
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rename an enumerator
    
    CSV is no longer the only target value that can be solved for: solves
    for target NAAR are already implemented, and will soon be offered in
    the GUI.
---
 input_harmonization.cpp | 10 +++++-----
 mc_enum_types.xpp       |  2 +-
 solve.cpp               |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index f685215..a369733 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -790,10 +790,10 @@ false // Silly workaround for now.
 #endif // 0
 
     SolveTarget.enable(actually_solving);
-    SolveTarget.allow(mce_solve_for_endt     , actually_solving);
-    SolveTarget.allow(mce_solve_for_target   , actually_solving);
-    SolveTarget.allow(mce_solve_for_tax_basis, actually_solving);
-    SolveTarget.allow(mce_solve_for_non_mec  , actually_solving && 
mce_solve_loan != SolveType);
+    SolveTarget.allow(mce_solve_for_endt      , actually_solving);
+    SolveTarget.allow(mce_solve_for_target_csv, actually_solving);
+    SolveTarget.allow(mce_solve_for_tax_basis , actually_solving);
+    SolveTarget.allow(mce_solve_for_non_mec   , actually_solving && 
mce_solve_loan != SolveType);
 
     // There is no fundamental reason for forbidding non-MEC solves on
     // bases other than current, but no one has ever complained about
@@ -810,7 +810,7 @@ false // Silly workaround for now.
     SolveSeparateAccountBasis.allow(mce_sep_zero, actually_solving && 
allow_sep_acct);
     SolveSeparateAccountBasis.allow(mce_sep_half, actually_solving && 
allow_sep_acct && is_three_rate_nasd(GleanedLedgerType_));
 
-    SolveTargetCashSurrenderValue.enable(actually_solving && 
mce_solve_for_target == SolveTarget);
+    SolveTargetCashSurrenderValue.enable(actually_solving && 
mce_solve_for_target_csv == SolveTarget);
 
     bool enable_reduce_to_avoid_mec =
             !(actually_solving && mce_solve_for_non_mec == SolveTarget)
diff --git a/mc_enum_types.xpp b/mc_enum_types.xpp
index 33c22d7..40317c4 100644
--- a/mc_enum_types.xpp
+++ b/mc_enum_types.xpp
@@ -230,7 +230,7 @@
 
 #define solve_target_VALUES \
     {mce_solve_for_endt \
-    ,mce_solve_for_target \
+    ,mce_solve_for_target_csv \
     ,mce_solve_for_tax_basis \
     ,mce_solve_for_non_mec \
     };
diff --git a/solve.cpp b/solve.cpp
index dd88807..344feef 100644
--- a/solve.cpp
+++ b/solve.cpp
@@ -134,7 +134,7 @@ double SolveTest()
                 }
             }
             break;
-        case mce_solve_for_target:
+        case mce_solve_for_target_csv:
             {
             y = ThatSolveTargetCSV;
             }