[lmi-commits] [lmi] master 6bde573 12/25: Make certain shared_ptr members const

[Greg Chicares]

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

    Make certain shared_ptr members const
---
 basic_values.hpp | 12 ++++++------
 ihs_basicval.cpp | 24 ++++++++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/basic_values.hpp b/basic_values.hpp
index 880111b..f02909b 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -119,12 +119,12 @@ class LMI_SO BasicValues
 
     yare_input                                yare_input_;
 
-    std::shared_ptr<product_data       const> product_;
-    product_database                   const  database_;
-    std::shared_ptr<lingo              const> lingo_;
-    std::shared_ptr<FundData           const> FundData_;
-    std::shared_ptr<rounding_rules     const> RoundingRules_;
-    std::shared_ptr<stratified_charges const> StratifiedCharges_;
+    std::shared_ptr<product_data       const> const product_;
+    product_database                          const database_;
+    std::shared_ptr<lingo              const> const lingo_;
+    std::shared_ptr<FundData           const> const FundData_;
+    std::shared_ptr<rounding_rules     const> const RoundingRules_;
+    std::shared_ptr<stratified_charges const> const StratifiedCharges_;
 
     std::unique_ptr<MortalityRates>     MortalityRates_;
     std::unique_ptr<InterestRates>      InterestRates_;
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 9bbed20..1e25678 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -68,6 +68,14 @@ BasicValues::BasicValues(Input const& input)
     :yare_input_         (input)
     ,product_            
(product_data::read_via_cache(filename_from_product_name(yare_input_.ProductName)))
     ,database_           (yare_input_)
+    ,lingo_              (lingo::read_via_cache
+        (AddDataDir(product().datum("LingoFilename"))))
+    ,FundData_           (FundData::read_via_cache
+        (AddDataDir(product().datum("FundFilename"))))
+    ,RoundingRules_      (rounding_rules::read_via_cache
+        (AddDataDir(product().datum("RoundingFilename"))))
+    ,StratifiedCharges_  (stratified_charges::read_via_cache
+        (AddDataDir(product().datum("TierFilename"))))
     ,DefnLifeIns_        {mce_cvat}
     ,DefnMaterialChange_ {mce_unnecessary_premium}
     ,Effective7702DboRop {mce_option1_for_7702}
@@ -108,6 +116,14 @@ BasicValues::BasicValues
         ,a_UnderwritingBasis
         ,a_StateOfJurisdiction
         )
+    ,lingo_              (lingo::read_via_cache
+        (AddDataDir(product().datum("LingoFilename"))))
+    ,FundData_           (FundData::read_via_cache
+        (AddDataDir(product().datum("FundFilename"))))
+    ,RoundingRules_      (rounding_rules::read_via_cache
+        (AddDataDir(product().datum("RoundingFilename"))))
+    ,StratifiedCharges_  (stratified_charges::read_via_cache
+        (AddDataDir(product().datum("TierFilename"))))
     ,DefnLifeIns_        {mce_cvat}
     ,DefnMaterialChange_ {mce_unnecessary_premium}
     ,Effective7702DboRop {a_DBOptFor7702}
@@ -188,15 +204,7 @@ BasicValues::~BasicValues() = default;
 //============================================================================
 void BasicValues::Init()
 {
-    lingo_             = lingo::read_via_cache
-        (AddDataDir(product().datum("LingoFilename")));
-    FundData_          = FundData::read_via_cache
-        (AddDataDir(product().datum("FundFilename")));
-    RoundingRules_     = rounding_rules::read_via_cache
-        (AddDataDir(product().datum("RoundingFilename")));
     SetRoundingFunctors();
-    StratifiedCharges_ = stratified_charges::read_via_cache
-        (AddDataDir(product().datum("TierFilename")));
 
     SetPermanentInvariants();