[lmi-commits] [lmi] master 4c6e6c3 6/9: Prefer bourn_cast to static_cast for arithmetic type conversions

[Greg Chicares]

branch: master
commit 4c6e6c3f3b0a271b217287f2837fc70ca0a6cc01
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Prefer bourn_cast to static_cast for arithmetic type conversions
---
 ledger.cpp           | 5 +++--
 ledger_evaluator.cpp | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ledger.cpp b/ledger.cpp
index c937a45..71472be 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -25,6 +25,7 @@
 
 #include "alert.hpp"
 #include "assert_lmi.hpp"
+#include "bourn_cast.hpp"
 #include "crc32.hpp"
 #include "global_settings.hpp"
 #include "ledger_invariant.hpp"
@@ -179,7 +180,7 @@ void Ledger::ZeroInforceAfterLapse()
 
     auto original_length = ledger_invariant_->InforceLives.size();
     using T = decltype(original_length);
-    T unlapsed_length = static_cast<T>(1 + lapse_year);
+    T unlapsed_length = bourn_cast<T>(1 + lapse_year);
     if(unlapsed_length < original_length)
         {
         ledger_invariant_->InforceLives.resize(unlapsed_length);
@@ -290,7 +291,7 @@ int Ledger::greatest_lapse_dur() const
         {
         max_length = std::max(max_length, i.second.LapseYear);
         }
-    return static_cast<int>(max_length);
+    return bourn_cast<int>(max_length);
 }
 
 //============================================================================
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 4e6eb83..fbac1dd 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -26,6 +26,7 @@
 
 #include "alert.hpp"
 #include "authenticity.hpp"
+#include "bourn_cast.hpp"
 #include "calendar_date.hpp"
 #include "configurable_settings.hpp"
 #include "contains.hpp"
@@ -697,8 +698,8 @@ ledger_evaluator Ledger::make_evaluator() const
     double GreatestLapseDuration = greatest_lapse_dur();
     scalars["GreatestLapseDuration"] = &GreatestLapseDuration;
 
-    int max_duration = static_cast<int>(ledger_invariant_->EndtAge - 
ledger_invariant_->Age);
-    int issue_age = static_cast<int>(ledger_invariant_->Age);
+    int max_duration = bourn_cast<int>(ledger_invariant_->EndtAge - 
ledger_invariant_->Age);
+    int issue_age = bourn_cast<int>(ledger_invariant_->Age);
 
     std::vector<double> AttainedAge(max_duration);
     std::vector<double> Duration   (max_duration);
@@ -808,7 +809,7 @@ ledger_evaluator Ledger::make_evaluator() const
         //   - use EffDate as date prepared
         // in order to avoid gratuitous failures.
         LmiVersion = "Regression testing";
-        
prep_date.julian_day_number(static_cast<int>(ledger_invariant_->EffDateJdn));
+        
prep_date.julian_day_number(bourn_cast<int>(ledger_invariant_->EffDateJdn));
         }
 
     strings["LmiVersion"] = &LmiVersion;