[lmi-commits] [lmi] master 78d6d35 4/7: Do away with unused return value #3

[Greg Chicares]

branch: master
commit 78d6d35fb95b05fd26f63978dc61ed55d756d7d1
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Do away with unused return value #3
---
 account_value.hpp |  2 +-
 accountvalue.cpp  |  7 ++-----
 ihs_acctval.cpp   | 11 ++---------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/account_value.hpp b/account_value.hpp
index ec2508c..eb68d73 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -132,7 +132,7 @@ class LMI_SO AccountValue final
 
     double RunOneCell              (mcenum_run_basis);
     double RunOneBasis             (mcenum_run_basis);
-    double RunAllApplicableBases   ();
+    void   RunAllApplicableBases   ();
     void   InitializeLife          (mcenum_run_basis);
     void   FinalizeLife            (mcenum_run_basis);
     void   FinalizeLifeAllBases    ();
diff --git a/accountvalue.cpp b/accountvalue.cpp
index 73d1b83..e2071f5 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -172,7 +172,7 @@ double AccountValue::RunOneBasis(mcenum_run_basis TheBasis)
 //   if running all bases
 //     run all bases
 //
-double AccountValue::RunAllApplicableBases()
+void AccountValue::RunAllApplicableBases()
 {
     // set pmts, specamt, surrchg
 
@@ -184,10 +184,9 @@ double AccountValue::RunAllApplicableBases()
         ,mce_sep_full
         );
 
-    double z = 0.0;
     if(Solving)
         {
-        z = Solve();
+        Solve();
         OverridingPmts = stored_pmts;
         ledger_->SetOneLedgerVariant(run_basis, VariantValues());
         Solving = false;
@@ -205,8 +204,6 @@ double AccountValue::RunAllApplicableBases()
     run_basis = mce_run_gen_mdpt_sep_full;
     RunOneBasis(run_basis);
     ledger_->SetOneLedgerVariant(run_basis, VariantValues());
-
-    return z;
 }
 
 //============================================================================
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 1f1fbb9..f64c511 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -205,11 +205,7 @@ Then run other bases.
         DebugPrintInit();
         }
 
-<<<<<<< HEAD
-    double z = RunAllApplicableBases();
-=======
     RunAllApplicableBases();
->>>>>>> 5447866e... Do away with unused return value #2
 
     FinalizeLifeAllBases();
 }
@@ -265,10 +261,8 @@ double AccountValue::RunOneBasis(mcenum_run_basis a_Basis)
 //   if running all bases
 //     run all bases
 //
-double AccountValue::RunAllApplicableBases()
+void AccountValue::RunAllApplicableBases()
 {
-    double z = 0.0;
-
     // TODO ?? Normally, running on the current basis determines the
     // overriding values for all components of outlay--e.g., premiums,
     // forceouts, loans, and withdrawals. For a solve on any basis
@@ -293,7 +287,7 @@ double AccountValue::RunAllApplicableBases()
             RunOneBasis(mce_run_gen_curr_sep_full);
             }
 
-        z = Solve
+        Solve
             (yare_input_.SolveType
             ,yare_input_.SolveBeginYear
             ,yare_input_.SolveEndYear
@@ -312,7 +306,6 @@ double AccountValue::RunAllApplicableBases()
         {
         RunOneBasis(b);
         }
-    return z;
 }
 
 //============================================================================