[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master f092e7e 4/6: Add and use a new enumerator for
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master f092e7e 4/6: Add and use a new enumerator for 7702 treatment of term |
Date: |
Fri, 9 Nov 2018 20:48:00 -0500 (EST) |
branch: master
commit f092e7eb6f6209eb002e43ebe875e0ca3dcf45bb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Add and use a new enumerator for 7702 treatment of term
---
dbdict.cpp | 4 ++--
ihs_basicval.cpp | 4 ++--
oecumenic_enumerations.hpp | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dbdict.cpp b/dbdict.cpp
index 6aa4ed9..b291a9d 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -941,8 +941,8 @@ void DBDictionary::write_database_files()
z.Add(database_entity(DB_RiskyInitial7702Db , false));
z.Add(database_entity(DB_Irc7702Endowment , 0));
z.Add(database_entity(DB_Effective7702DboRop , 0));
- z.Add(database_entity(DB_TermIsQABOrDb7702 , 1));
- z.Add(database_entity(DB_TermIsQABOrDb7702A , 1));
+ z.Add(database_entity(DB_TermIsQABOrDb7702 , oe_7702_term_is_db));
+ z.Add(database_entity(DB_TermIsQABOrDb7702A , oe_7702_term_is_db));
z.Add(database_entity(DB_GioIsQAB , false));
z.Add(database_entity(DB_AdbIsQAB , false));
z.Add(database_entity(DB_SpouseRiderIsQAB , false));
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 3c3eb9d..bf0367d 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -761,8 +761,8 @@ void BasicValues::SetPermanentInvariants()
DefnMaterialChange_ = (mce_gpt == DefnLifeIns_) ? mce_adjustment_event
: z;
}
database().query_into(DB_Effective7702DboRop, Effective7702DboRop);
- TermIsDbFor7702 = 1.0 == database().Query(DB_TermIsQABOrDb7702 );
- TermIsDbFor7702A = 1.0 == database().Query(DB_TermIsQABOrDb7702A);
+ TermIsDbFor7702 = oe_7702_term_is_db ==
database().query<oenum_7702_term>(DB_TermIsQABOrDb7702 );
+ TermIsDbFor7702A = oe_7702_term_is_db ==
database().query<oenum_7702_term>(DB_TermIsQABOrDb7702A);
MaxNAAR = yare_input_.MaximumNaar;
database().query_into(DB_MinPremIntSpread, MinPremIntSpread_);
diff --git a/oecumenic_enumerations.hpp b/oecumenic_enumerations.hpp
index 668b5d3..2cb72c2 100644
--- a/oecumenic_enumerations.hpp
+++ b/oecumenic_enumerations.hpp
@@ -115,6 +115,12 @@ enum oenum_smoking_or_tobacco
,oe_tobacco_nontobacco
};
+enum oenum_7702_term
+ {oe_7702_term_is_ignored
+ ,oe_7702_term_is_db
+ ,oe_7702_term_is_qab
+ };
+
enum oenum_visibility
{oe_shown
,oe_hidden
- [lmi-commits] [lmi] master updated (53201ac -> b3acc4a), Greg Chicares, 2018/11/09
- [lmi-commits] [lmi] master e0decd5 2/6: Note a future database improvement, Greg Chicares, 2018/11/09
- [lmi-commits] [lmi] master 0f1933d 3/6: Alphabetize enums, Greg Chicares, 2018/11/09
- [lmi-commits] [lmi] master 2b88ca2 1/6: Use query<int> with an obsolescent database entity, Greg Chicares, 2018/11/09
- [lmi-commits] [lmi] master f092e7e 4/6: Add and use a new enumerator for 7702 treatment of term,
Greg Chicares <=
- [lmi-commits] [lmi] master a58de62 5/6: Remove an unneeded Query() overload, Greg Chicares, 2018/11/09
- [lmi-commits] [lmi] master b3acc4a 6/6: Rename the last (capital 'Q') Query() function, Greg Chicares, 2018/11/09