[lmi-commits] [lmi] master 5b4e08d 4/6: Remove redundant template arguments

[Greg Chicares]

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

    Remove redundant template arguments
    
    The immediately preceding commit left old *_cast<T> template arguments
    in place, only in order to make sure they didn't disagree with actual
    variable types (because a latent error of that sort should be identified
    before removal). No such error having been found, removed the arguments.
---
 basicvalues.cpp         |  6 +++---
 database.cpp            |  2 +-
 gpt_input.cpp           |  2 +-
 ihs_basicval.cpp        | 28 ++++++++++++++--------------
 input_harmonization.cpp |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/basicvalues.cpp b/basicvalues.cpp
index 1eece92..53617cc 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -97,11 +97,11 @@ void BasicValues::Init()
     PremiumTaxState_     = yare_input_.PremiumTaxState    ;
 
     // The database class constrains maturity age to be scalar.
-    database().query_into<int>(DB_MaturityAge, EndtAge);
+    database().query_into(DB_MaturityAge   , EndtAge);
     Length = EndtAge - IssueAge;
 
-    database().query_into(DB_LedgerType, ledger_type_);
-    database().query_into<bool>(DB_Nonillustrated, nonillustrated_);
+    database().query_into(DB_LedgerType    , ledger_type_);
+    database().query_into(DB_Nonillustrated, nonillustrated_);
     bool no_longer_issued = database().query<bool>(DB_NoLongerIssued);
     bool is_new_business  = yare_input_.EffectiveDate == 
yare_input_.InforceAsOfDate;
     no_can_issue_         = no_longer_issued && is_new_business;
diff --git a/database.cpp b/database.cpp
index 76cbe65..3de4054 100644
--- a/database.cpp
+++ b/database.cpp
@@ -206,7 +206,7 @@ void product_database::initialize(std::string const& 
product_name)
         LMI_ASSERT(!filename.empty());
         db_ = DBDictionary::read_via_cache(AddDataDir(filename));
         }
-    query_into<int>(DB_MaturityAge, maturity_age_);
+    query_into(DB_MaturityAge, maturity_age_);
     length_ = maturity_age_ - index_.index_vector()[e_axis_issue_age];
     LMI_ASSERT(0 < length_ && length_ <= methuselah);
 }
diff --git a/gpt_input.cpp b/gpt_input.cpp
index 9cec048..4f2a4fb 100644
--- a/gpt_input.cpp
+++ b/gpt_input.cpp
@@ -274,7 +274,7 @@ void gpt_input::DoAdaptExternalities()
             )
         );
 
-    database_->query_into<int>(DB_MaturityAge, GleanedMaturityAge_);
+    database_->query_into(DB_MaturityAge, GleanedMaturityAge_);
 }
 
 datum_base const* gpt_input::DoBaseDatumPointer
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 69e7db0..bbebf6f 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -173,11 +173,11 @@ void BasicValues::Init()
     LMI_ASSERT(RetAge <= 100);
     LMI_ASSERT(yare_input_.RetireesCanEnroll || IssueAge <= RetAge);
 
-    database().query_into<int>(DB_MaturityAge, EndtAge);
+    database().query_into(DB_MaturityAge   , EndtAge);
     Length = EndtAge - IssueAge;
 
-    database().query_into(DB_LedgerType, ledger_type_);
-    database().query_into<bool>(DB_Nonillustrated, nonillustrated_);
+    database().query_into(DB_LedgerType    , ledger_type_);
+    database().query_into(DB_Nonillustrated, nonillustrated_);
     bool no_longer_issued = database().query<bool>(DB_NoLongerIssued);
     bool is_new_business  = yare_input_.EffectiveDate == 
yare_input_.InforceAsOfDate;
     no_can_issue_         = no_longer_issued && is_new_business;
@@ -261,7 +261,7 @@ void BasicValues::GPTServerInit()
     StateOfJurisdiction_ = yare_input_.StateOfJurisdiction;
     PremiumTaxState_     = yare_input_.PremiumTaxState    ;
 
-    database().query_into<int>(DB_MaturityAge, EndtAge);
+    database().query_into(DB_MaturityAge   , EndtAge);
     Length = EndtAge - IssueAge;
 
     yare_input_.ExtraMonthlyCustodialFee  .resize(Length);
@@ -272,8 +272,8 @@ void BasicValues::GPTServerInit()
     yare_input_.DeathBenefitOption        .assign(Length, 
yare_input_.DeathBenefitOption[0]);
     yare_input_.FlatExtra                 .resize(Length);
 
-    database().query_into(DB_LedgerType, ledger_type_);
-    database().query_into<bool>(DB_Nonillustrated, nonillustrated_);
+    database().query_into(DB_LedgerType    , ledger_type_);
+    database().query_into(DB_Nonillustrated, nonillustrated_);
     bool no_longer_issued = database().query<bool>(DB_NoLongerIssued);
     bool is_new_business  = yare_input_.EffectiveDate == 
yare_input_.InforceAsOfDate;
     no_can_issue_         = no_longer_issued && is_new_business;
@@ -617,11 +617,11 @@ void BasicValues::SetPermanentInvariants()
     WDCanDecrSADBO1     = database().Query(DB_WdCanDecrSpecAmtDbo1 );
     WDCanDecrSADBO2     = database().Query(DB_WdCanDecrSpecAmtDbo2 );
     WDCanDecrSADBO3     = database().Query(DB_WdCanDecrSpecAmtDbo3 );
-    database().query_into<int>(DB_MaxIncrAge, MaxIncrAge);
+    database().query_into(DB_MaxIncrAge       , MaxIncrAge);
     WaivePmTxInt1035    = database().Query(DB_WaivePremTaxInt1035  );
     TermIsNotRider      = database().Query(DB_TermIsNotRider       );
-    database().query_into<int>(DB_TermForcedConvAge, TermForcedConvAge);
-    database().query_into<int>(DB_TermForcedConvDur, TermForcedConvDur);
+    database().query_into(DB_TermForcedConvAge, TermForcedConvAge);
+    database().query_into(DB_TermForcedConvDur, TermForcedConvDur);
     ExpPerKLimit        = database().Query(DB_ExpSpecAmtLimit      );
     database().query_into(DB_MinPremType, MinPremType);
     database().query_into(DB_TgtPremType, TgtPremType);
@@ -640,12 +640,12 @@ void BasicValues::SetPermanentInvariants()
     database().query_into(DB_MaxWdDed         , MaxWDDed_        );
     MaxWdGenAcctValMult = database().Query(DB_MaxWdGenAcctValMult  );
     MaxWdSepAcctValMult = database().Query(DB_MaxWdSepAcctValMult  );
-    database().query_into<bool>(DB_AllowPrefLoan, AllowPrefLoan);
-    database().query_into(DB_MaxLoanDed       ,MaxLoanDed_);
+    database().query_into(DB_AllowPrefLoan    , AllowPrefLoan);
+    database().query_into(DB_MaxLoanDed       , MaxLoanDed_);
     MaxLoanAVMult       = database().Query(DB_MaxLoanAcctValMult   );
-    database().query_into<int>(DB_FirstPrefLoanYear, FirstPrefLoanYear);
-    database().query_into<int>(DB_NoLapseMinDur    , NoLapseMinDur);
-    database().query_into<int>(DB_NoLapseMinAge    , NoLapseMinAge);
+    database().query_into(DB_FirstPrefLoanYear, FirstPrefLoanYear);
+    database().query_into(DB_NoLapseMinDur    , NoLapseMinDur);
+    database().query_into(DB_NoLapseMinAge    , NoLapseMinAge);
     AdbLimit            = database().Query(DB_AdbLimit             );
     WpLimit             = database().Query(DB_WpLimit              );
     SpecAmtLoadLimit    = database().Query(DB_SpecAmtLoadLimit     );
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index 552f9e1..0433801 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -93,9 +93,9 @@ void Input::DoAdaptExternalities()
             )
         );
 
-    database_->query_into<int>(DB_MaturityAge, GleanedMaturityAge_);
+    database_->query_into(DB_MaturityAge, GleanedMaturityAge_);
 
-    database_->query_into(DB_LedgerType, GleanedLedgerType_);
+    database_->query_into(DB_LedgerType , GleanedLedgerType_ );
 }
 
 void Input::DoCustomizeInitialValues()