[lmi-commits] [lmi] master bad394a 3/7: Do away with unused return value #2

[Greg Chicares]

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

    Do away with unused return value #2
---
 account_value.hpp | 2 +-
 accountvalue.cpp  | 4 ++--
 ihs_acctval.cpp   | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/account_value.hpp b/account_value.hpp
index 7c53de4..ec2508c 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -59,7 +59,7 @@ class LMI_SO AccountValue final
     AccountValue(AccountValue&&) = default;
     ~AccountValue() override = default;
 
-    double RunAV                ();
+    void RunAV();
 
     void SetDebugFilename    (std::string const&);
 
diff --git a/accountvalue.cpp b/accountvalue.cpp
index b6b1bab..73d1b83 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -139,12 +139,12 @@ std::shared_ptr<Ledger const> 
AccountValue::ledger_from_av() const
 }
 
 //============================================================================
-double AccountValue::RunAV()
+void AccountValue::RunAV()
 {
     InvariantValues().Init(this);
     OverridingPmts = stored_pmts;
     Solving = mce_solve_none != yare_input_.SolveType;
-    return RunAllApplicableBases();
+    RunAllApplicableBases();
 }
 
 //============================================================================
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 77dc63f..1f1fbb9 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -180,7 +180,7 @@ std::shared_ptr<Ledger const> 
AccountValue::ledger_from_av() const
 }
 
 //============================================================================
-double AccountValue::RunAV()
+void AccountValue::RunAV()
 {
 /*
 First run current, for solves and strategies. This determines
@@ -205,11 +205,13 @@ Then run other bases.
         DebugPrintInit();
         }
 
+<<<<<<< HEAD
     double z = RunAllApplicableBases();
+=======
+    RunAllApplicableBases();
+>>>>>>> 5447866e... Do away with unused return value #2
 
     FinalizeLifeAllBases();
-
-    return z;
 }
 
 //============================================================================