[lmi-commits] [6283] Reduce physical dependency by fixing 'build_type=so_test' erosion

[Greg Chicares]

Revision: 6283
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6283
Author:   chicares
Date:     2015-09-18 23:55:30 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Reduce physical dependency by fixing 'build_type=so_test' erosion

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/configurable_settings.hpp
    lmi/trunk/group_quote_pdf_gen_wx.cpp
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/ledger_invariant.hpp
    lmi/trunk/ledger_text_formats.hpp
    lmi/trunk/mc_enum_types_aux.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-09-18 00:51:14 UTC (rev 6282)
+++ lmi/trunk/ChangeLog 2015-09-18 23:55:30 UTC (rev 6283)
@@ -36799,3 +36799,13 @@
 Resolve gcc-5 issues (VZ). See:
   http://lists.nongnu.org/archive/html/lmi/2015-09/msg00000.html
 
+20150918T2355Z <address@hidden> [474]
+
+  configurable_settings.hpp
+  group_quote_pdf_gen_wx.cpp
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  ledger_text_formats.hpp
+  mc_enum_types_aux.cpp
+Reduce physical dependency by fixing 'build_type=so_test' erosion.
+

Modified: lmi/trunk/configurable_settings.hpp
===================================================================
--- lmi/trunk/configurable_settings.hpp 2015-09-18 00:51:14 UTC (rev 6282)
+++ lmi/trunk/configurable_settings.hpp 2015-09-18 23:55:30 UTC (rev 6283)
@@ -124,8 +124,9 @@
     ~configurable_settings();
 };
 
-std::vector<std::string> input_calculation_summary_columns();
-std::vector<std::string> effective_calculation_summary_columns();
+std::vector<std::string>        input_calculation_summary_columns();
+// This function must be visible to 'wx_test_calculation_summary.cpp'.
+std::vector<std::string> LMI_SO effective_calculation_summary_columns();
 
 #endif // configurable_settings_hpp
 

Modified: lmi/trunk/group_quote_pdf_gen_wx.cpp
===================================================================
--- lmi/trunk/group_quote_pdf_gen_wx.cpp        2015-09-18 00:51:14 UTC (rev 
6282)
+++ lmi/trunk/group_quote_pdf_gen_wx.cpp        2015-09-18 23:55:30 UTC (rev 
6283)
@@ -367,7 +367,7 @@
     prepared_by_      = ledger.ProducerName;
     product_          = ledger.ProductName;
     available_riders_ = "Waiver, ADB, ABR, Spouse or Child"; // FIXME
-    premium_mode_     = ledger.ErMode.at(0).str();
+    premium_mode_     = ledger.InitErMode;
     contract_state_   = ledger.GetStatePostalAbbrev();
     footer_           = ledger.MarketingNameFootnote;
     // Input::Comments will replace these two:

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2015-09-18 00:51:14 UTC (rev 6282)
+++ lmi/trunk/ledger_invariant.cpp      2015-09-18 23:55:30 UTC (rev 6283)
@@ -367,6 +367,7 @@
     // Scalars of type not compatible with double.
     EffDate                = obj.EffDate               ;
     DateOfBirth            = obj.DateOfBirth           ;
+    InitErMode             = obj.InitErMode            ;
 
     FullyInitialized       = obj.FullyInitialized      ;
 }
@@ -793,6 +794,7 @@
     EffDateJdn              = 
calendar_date(b->yare_input_.EffectiveDate).julian_day_number();
     DateOfBirth             = calendar_date(b->yare_input_.DateOfBirth).str();
     DateOfBirthJdn          = 
calendar_date(b->yare_input_.DateOfBirth).julian_day_number();
+    InitErMode              = mc_str(b->Outlay_->er_premium_modes()[0]);
     DefnLifeIns             = mc_str(b->yare_input_.DefinitionOfLifeInsurance);
     DefnMaterialChange      = 
mc_str(b->yare_input_.DefinitionOfMaterialChange);
     AvoidMec                = mc_str(b->yare_input_.AvoidMecMethod);
@@ -884,6 +886,7 @@
     EffDateJdn              = a_Addend.EffDateJdn;
     DateOfBirth             = a_Addend.DateOfBirth;
     DateOfBirthJdn          = a_Addend.DateOfBirthJdn;
+    InitErMode              = a_Addend.InitErMode;
     Age                     = std::min(Age, a_Addend.Age);
     RetAge                  = std::min(RetAge, a_Addend.RetAge); // TODO ?? 
Does this make sense?
     EndtAge                 = std::max(EndtAge, a_Addend.EndtAge);

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2015-09-18 00:51:14 UTC (rev 6282)
+++ lmi/trunk/ledger_invariant.hpp      2015-09-18 23:55:30 UTC (rev 6283)
@@ -342,6 +342,13 @@
     std::string     EffDate;
     std::string     DateOfBirth;
 
+    // Arguably enumerative members such as 'ErMode' should be of type
+    // std::string instead, because strings would be more useful for
+    // generating reports from this class's data, and mc_enum::str()
+    // is not visible across a shared-library boundary. For now, this
+    // kludge solves an immediate problem for premium quotes.
+    std::string     InitErMode;
+
   private:
     void Alloc(int len);
     void Copy(LedgerInvariant const&);

Modified: lmi/trunk/ledger_text_formats.hpp
===================================================================
--- lmi/trunk/ledger_text_formats.hpp   2015-09-18 00:51:14 UTC (rev 6282)
+++ lmi/trunk/ledger_text_formats.hpp   2015-09-18 23:55:30 UTC (rev 6283)
@@ -46,12 +46,12 @@
 
 void LMI_SO PrintLedgerFlatText    (Ledger const&, std::ostream&);
 
-std::string ledger_format
+std::string LMI_SO ledger_format
     (double                            d
     ,std::pair<int,oenum_format_style> f
     );
 
-std::vector<std::string> ledger_format
+std::vector<std::string> LMI_SO ledger_format
     (std::vector<double>               dv
     ,std::pair<int,oenum_format_style> f
     );

Modified: lmi/trunk/mc_enum_types_aux.cpp
===================================================================
--- lmi/trunk/mc_enum_types_aux.cpp     2015-09-18 00:51:14 UTC (rev 6282)
+++ lmi/trunk/mc_enum_types_aux.cpp     2015-09-18 23:55:30 UTC (rev 6283)
@@ -33,7 +33,7 @@
 #include "mc_enum.hpp"
 #include "mc_enum_types.hpp"
 
-#include <cstddef> // std::size_t
+#include <cstddef>                      // std::size_t
 #include <stdexcept>
 
 namespace
@@ -139,6 +139,7 @@
 template std::string mc_str(mcenum_defn_material_change);
 template std::string mc_str(mcenum_gender              );
 template std::string mc_str(mcenum_mec_avoid_method    );
+template std::string mc_str(mcenum_mode                );
 template std::string mc_str(mcenum_report_column       );
 template std::string mc_str(mcenum_run_basis           );
 template std::string mc_str(mcenum_smoking             );