[lmi-commits] [lmi] master ba9c812: Remove stray spaces in template instantiations

[Greg Chicares]

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

    Remove stray spaces in template instantiations
---
 any_member_test.cpp        |  2 +-
 calendar_date.hpp          |  4 ++--
 database_view.cpp          |  2 +-
 database_view_editor.hpp   |  2 +-
 group_quote_pdf_gen_wx.cpp |  8 ++++----
 input_sequence_entry.cpp   |  2 +-
 ledger_base.hpp            |  2 +-
 ledger_variant.hpp         |  2 +-
 ledger_xml_io.cpp          | 10 +++++-----
 math_functors.hpp          | 10 +++++-----
 math_functors_test.cpp     |  6 +++---
 multidimgrid_safe.hpp      |  4 ++--
 multidimgrid_safe.tpp      | 10 +++++-----
 multidimgrid_tools.hpp     |  6 +++---
 regex_test.cpp             | 24 ++++++++++++------------
 round_to.hpp               |  2 +-
 tier_view.cpp              |  2 +-
 tier_view_editor.hpp       |  2 +-
 zero.hpp                   |  2 +-
 19 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/any_member_test.cpp b/any_member_test.cpp
index 176da40..66b0b49 100644
--- a/any_member_test.cpp
+++ b/any_member_test.cpp
@@ -637,7 +637,7 @@ void any_member_test::supplemental_test1()
 
 template<typename ClassType> class Bar
 {
-    std::map<int, int> m_; // Works OK if you remove this line.
+    std::map<int,int> m_; // Works OK if you remove this line.
 };
 
 struct R : public Bar<R>
diff --git a/calendar_date.hpp b/calendar_date.hpp
index 39b8c2b..ec65d1a 100644
--- a/calendar_date.hpp
+++ b/calendar_date.hpp
@@ -124,7 +124,7 @@ jdn_t LMI_SO YmdToJdn(ymd_t);
 /// Implicitly-declared special member functions do the right thing.
 
 class LMI_SO calendar_date
-    :boost::additive<calendar_date, int>
+    :boost::additive<calendar_date,int>
     ,boost::totally_ordered<calendar_date>
     ,boost::unit_steppable<calendar_date>
 {
@@ -179,7 +179,7 @@ class LMI_SO calendar_date
 
 // gcc-3.x and bc-5.5.1 do not work at all well with this technique
 // suggested as a space optimization in the boost documentation:
-//    template struct boost::additive<calendar_date, int>;
+//    template struct boost::additive<calendar_date,int>;
 //    template struct boost::totally_ordered<calendar_date>;
 //    template struct boost::unit_steppable<calendar_date>;
 
diff --git a/database_view.cpp b/database_view.cpp
index ea5dcdf..c49c28e 100644
--- a/database_view.cpp
+++ b/database_view.cpp
@@ -172,7 +172,7 @@ MultiDimGrid* DatabaseView::CreateGridCtrl(wxWindow* parent)
 
 void DatabaseView::SetupControls()
 {
-    std::map<e_database_key, wxTreeItemId> name_to_id;
+    std::map<e_database_key,wxTreeItemId> name_to_id;
 
     wxTreeCtrl& tree_ctrl = tree();
 
diff --git a/database_view_editor.hpp b/database_view_editor.hpp
index 1307ce6..852b5c5 100644
--- a/database_view_editor.hpp
+++ b/database_view_editor.hpp
@@ -51,7 +51,7 @@
 /// std::shared_ptr constructed with deallocator object that does nothing.
 
 class DatabaseTableAdapter
-  :public MultiDimTable<double, DatabaseTableAdapter>
+  :public MultiDimTable<double,DatabaseTableAdapter>
 {
     enum enum_database_axis
         {eda_gender = 0
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index 3964a90..bb37e52 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -679,7 +679,7 @@ void 
group_quote_pdf_generator_wx::global_report_data::fill_global_report_data
             ;
         if(invar.HasSpouseRider)
             {
-            std::pair<int, oenum_format_style> const f0(0, oe_format_normal);
+            std::pair<int,oenum_format_style> const f0(0, oe_format_normal);
             double const number_of_lives = invar.GetInforceLives().at(0);
             LMI_ASSERT(0.0 < number_of_lives);
             elected_riders_footnote_ +=
@@ -768,8 +768,8 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const& 
ledger)
 
     int const year = 0;
 
-    std::pair<int, oenum_format_style> const f0(0, oe_format_normal);
-    std::pair<int, oenum_format_style> const f2(2, oe_format_normal);
+    std::pair<int,oenum_format_style> const f0(0, oe_format_normal);
+    std::pair<int,oenum_format_style> const f2(2, oe_format_normal);
 
     bool const is_composite = ledger.is_composite();
 
@@ -1329,7 +1329,7 @@ void group_quote_pdf_generator_wx::output_aggregate_values
             :(e_col_total_premium               == col) ? 2
             :throw std::logic_error("Invalid column type.")
             );
-        std::pair<int, oenum_format_style> const f(num_dec, oe_format_normal);
+        std::pair<int,oenum_format_style> const f(num_dec, oe_format_normal);
 
         table_gen.output_highlighted_cell
             (col
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index b9bdee3..4663110 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -343,7 +343,7 @@ class InputSequenceEditor
     wxButton* ok_button_;
     wxButton* cancel_button_;
     wxStaticText* diagnostics_;
-    typedef std::map<wxWindowID, int> id_to_row_map;
+    typedef std::map<wxWindowID,int> id_to_row_map;
     id_to_row_map id_to_row_;
 
     // scalar absolute values for end durations; this is used to recompute
diff --git a/ledger_base.hpp b/ledger_base.hpp
index 9835a79..85d99d8 100644
--- a/ledger_base.hpp
+++ b/ledger_base.hpp
@@ -99,7 +99,7 @@ class CRC;
 /// A map<> is clearly called for. Certain implementation choices must be made.
 ///
 /// Choice 1: Who owns the data? We want only one instance of the data to
-/// exist. If we have a bunch of vectors and a map<key, vector> then we have
+/// exist. If we have a bunch of vectors and a map<key,vector> then we have
 /// two copies; that wastes memory and, worse, the copies can become
 /// unsynchronized.
 ///
diff --git a/ledger_variant.hpp b/ledger_variant.hpp
index 24f3091..57f67c9 100644
--- a/ledger_variant.hpp
+++ b/ledger_variant.hpp
@@ -161,7 +161,7 @@ class LMI_SO LedgerVariant
     bool             FullyInitialized; // I.e. by Init(BasicValues const* b).
 };
 
-typedef std::map<mcenum_run_basis, LedgerVariant> ledger_map_t;
+typedef std::map<mcenum_run_basis,LedgerVariant> ledger_map_t;
 
 /// C++98 17.4.3.6 forbids declaring std::map<S,T> where S or T is
 /// incomplete. But class ledger_map_holder can be forward declared
diff --git a/ledger_xml_io.cpp b/ledger_xml_io.cpp
index 528211d..c980da4 100644
--- a/ledger_xml_io.cpp
+++ b/ledger_xml_io.cpp
@@ -73,7 +73,7 @@ std::vector<std::string> const suffixes
     ,char_p_suffixes + n
     );
 
-typedef std::map<std::string, std::pair<int, oenum_format_style>> format_map_t;
+typedef std::map<std::string, std::pair<int,oenum_format_style>> format_map_t;
 typedef std::map<std::string, std::string> title_map_t;
 
 // For all numbers (so-called 'scalars' and 'vectors', but not
@@ -310,10 +310,10 @@ void Ledger::write(xml::element& x) const
 //   percentage (scaled by 100, '%' at end) or not
 // and therefore F0 is equivalent to F1
 
-    std::pair<int, oenum_format_style> f1(0, oe_format_normal);
-    std::pair<int, oenum_format_style> f2(2, oe_format_normal);
-    std::pair<int, oenum_format_style> f3(0, oe_format_percentage);
-    std::pair<int, oenum_format_style> f4(2, oe_format_percentage);
+    std::pair<int,oenum_format_style> f1(0, oe_format_normal);
+    std::pair<int,oenum_format_style> f2(2, oe_format_normal);
+    std::pair<int,oenum_format_style> f3(0, oe_format_percentage);
+    std::pair<int,oenum_format_style> f4(2, oe_format_percentage);
 
     format_map_t format_map;
 
diff --git a/math_functors.hpp b/math_functors.hpp
index 95b1b65..88cc781 100644
--- a/math_functors.hpp
+++ b/math_functors.hpp
@@ -155,7 +155,7 @@ struct i_upper_n_over_n_from_i
 
 template<typename T>
 struct i_upper_12_over_12_from_i
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     T operator()(T const& i) const
@@ -166,7 +166,7 @@ struct i_upper_12_over_12_from_i
 
 template<typename T, int n>
 struct i_from_i_upper_n_over_n
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     static_assert(0 < n, "");
@@ -181,7 +181,7 @@ struct i_from_i_upper_n_over_n
 
 template<typename T>
 struct i_from_i_upper_12_over_12
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     T operator()(T const& i) const
@@ -192,7 +192,7 @@ struct i_from_i_upper_12_over_12
 
 template<typename T, int n>
 struct d_upper_n_from_i
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     static_assert(0 < n, "");
@@ -218,7 +218,7 @@ struct d_upper_n_from_i
 
 template<typename T>
 struct d_upper_12_from_i
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     T operator()(T const& i) const
diff --git a/math_functors_test.cpp b/math_functors_test.cpp
index 6b088d9..9eaaa99 100644
--- a/math_functors_test.cpp
+++ b/math_functors_test.cpp
@@ -58,7 +58,7 @@ bool lmi_isnan(T t)
 
 template<typename T>
 struct i_upper_12_over_12_from_i_naive
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     T operator()(T const& i) const
@@ -70,7 +70,7 @@ struct i_upper_12_over_12_from_i_naive
 
 template<typename T>
 struct i_from_i_upper_12_over_12_naive
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     T operator()(T const& i) const
@@ -82,7 +82,7 @@ struct i_from_i_upper_12_over_12_naive
 
 template<typename T>
 struct d_upper_12_from_i_naive
-    :public std::unary_function<T, T>
+    :public std::unary_function<T,T>
 {
     static_assert(std::is_floating_point<T>::value, "");
     T operator()(T const& i) const
diff --git a/multidimgrid_safe.hpp b/multidimgrid_safe.hpp
index dd809f3..b2a91da 100644
--- a/multidimgrid_safe.hpp
+++ b/multidimgrid_safe.hpp
@@ -191,7 +191,7 @@ struct ValueCastConversion
 ///
 /// Example of usage:
 /// class MyTable
-///     : MultiDimTable<int, MyTable>
+///     : MultiDimTable<int,MyTable>
 /// {
 ///   public:
 ///     /// MultiDimTable contract:
@@ -236,7 +236,7 @@ class MultiDimTable
     std::string ValueToString(boost::any const&) const override;
 };
 
-/// Design notes for MultiDimAdjustableAxis<AdjustControl, BaseAxisType>
+/// Design notes for MultiDimAdjustableAxis<AdjustControl,BaseAxisType>
 ///
 /// Adjustable Axis base class.
 ///
diff --git a/multidimgrid_safe.tpp b/multidimgrid_safe.tpp
index 086305f..9c388a2 100644
--- a/multidimgrid_safe.tpp
+++ b/multidimgrid_safe.tpp
@@ -168,11 +168,11 @@ T ValueCastConversion<T>::StringToValue(std::string 
const& text) const
     return value_cast<T>(text);
 }
 
-/// MultiDimAdjustableAxis<AdjustControl, BaseAxisType>
+/// MultiDimAdjustableAxis<AdjustControl,BaseAxisType>
 /// ---------------------------------------------------
 
 template<typename AdjustControl, typename BaseAxisType>
-wxWindow* MultiDimAdjustableAxis<AdjustControl, 
BaseAxisType>::CreateAdjustControl
+wxWindow* 
MultiDimAdjustableAxis<AdjustControl,BaseAxisType>::CreateAdjustControl
     (MultiDimGrid& grid
     ,MultiDimTableAny& table
     )
@@ -181,7 +181,7 @@ wxWindow* MultiDimAdjustableAxis<AdjustControl, 
BaseAxisType>::CreateAdjustContr
 }
 
 template<typename AdjustControl, typename BaseAxisType>
-bool MultiDimAdjustableAxis<AdjustControl, BaseAxisType>::ApplyAdjustment
+bool MultiDimAdjustableAxis<AdjustControl,BaseAxisType>::ApplyAdjustment
     (wxWindow& adjust_window
     ,unsigned int axis_id
     )
@@ -194,7 +194,7 @@ bool MultiDimAdjustableAxis<AdjustControl, 
BaseAxisType>::ApplyAdjustment
 }
 
 template<typename AdjustControl, typename BaseAxisType>
-bool MultiDimAdjustableAxis<AdjustControl, BaseAxisType>::RefreshAdjustment
+bool MultiDimAdjustableAxis<AdjustControl,BaseAxisType>::RefreshAdjustment
     (wxWindow& adjust_window
     ,unsigned int axis_id
     )
@@ -207,7 +207,7 @@ bool MultiDimAdjustableAxis<AdjustControl, 
BaseAxisType>::RefreshAdjustment
 }
 
 template<typename AdjustControl, typename BaseAxisType>
-MultiDimAdjustableAxis<AdjustControl, BaseAxisType>::MultiDimAdjustableAxis
+MultiDimAdjustableAxis<AdjustControl,BaseAxisType>::MultiDimAdjustableAxis
     (std::string const& name
     )
     :BaseAxisType(name)
diff --git a/multidimgrid_tools.hpp b/multidimgrid_tools.hpp
index b445af1..4b535bf 100644
--- a/multidimgrid_tools.hpp
+++ b/multidimgrid_tools.hpp
@@ -226,9 +226,9 @@ class AdjustableMaxBoundAxis
     ,MultiDimIntegralAxis<Integral>
     >
 {
-    typedef AxisMaxBoundAdjuster<Integral>                   Adjuster;
-    typedef MultiDimIntegralAxis<Integral>                   GrandBaseClass;
-    typedef MultiDimAdjustableAxis<Adjuster, GrandBaseClass> BaseClass;
+    typedef AxisMaxBoundAdjuster<Integral>                  Adjuster;
+    typedef MultiDimIntegralAxis<Integral>                  GrandBaseClass;
+    typedef MultiDimAdjustableAxis<Adjuster,GrandBaseClass> BaseClass;
 
   public:
     AdjustableMaxBoundAxis
diff --git a/regex_test.cpp b/regex_test.cpp
index 4b7b2c9..85337e4 100644
--- a/regex_test.cpp
+++ b/regex_test.cpp
@@ -253,22 +253,22 @@ void test_psalm_37()
     BOOST_TEST(!contains_regex2(never));
     BOOST_TEST(!contains_regex3(never));
 
-    std::cout << "  early 0:   " << TimeAnAliquot(mete<0, early>) << '\n';
-    std::cout << "  early 1:   " << TimeAnAliquot(mete<1, early>) << '\n';
-    std::cout << "  early 2:   " << TimeAnAliquot(mete<2, early>) << '\n';
-    std::cout << "  early 3:   " << TimeAnAliquot(mete<3, early>) << '\n';
+    std::cout << "  early 0:   " << TimeAnAliquot(mete<0,early>) << '\n';
+    std::cout << "  early 1:   " << TimeAnAliquot(mete<1,early>) << '\n';
+    std::cout << "  early 2:   " << TimeAnAliquot(mete<2,early>) << '\n';
+    std::cout << "  early 3:   " << TimeAnAliquot(mete<3,early>) << '\n';
     std::cout << '\n';
 
-    std::cout << "  late  0:   " << TimeAnAliquot(mete<0, late >) << '\n';
-    std::cout << "  late  1:   " << TimeAnAliquot(mete<1, late >) << '\n';
-    std::cout << "  late  2:   " << TimeAnAliquot(mete<2, late >) << '\n';
-    std::cout << "  late  3:   " << TimeAnAliquot(mete<3, late >) << '\n';
+    std::cout << "  late  0:   " << TimeAnAliquot(mete<0,late >) << '\n';
+    std::cout << "  late  1:   " << TimeAnAliquot(mete<1,late >) << '\n';
+    std::cout << "  late  2:   " << TimeAnAliquot(mete<2,late >) << '\n';
+    std::cout << "  late  3:   " << TimeAnAliquot(mete<3,late >) << '\n';
     std::cout << '\n';
 
-    std::cout << "  never 0:   " << TimeAnAliquot(mete<0, never>) << '\n';
-    std::cout << "  never 1:   " << TimeAnAliquot(mete<1, never>) << '\n';
-    std::cout << "  never 2:   " << TimeAnAliquot(mete<2, never>) << '\n';
-    std::cout << "  never 3:   " << TimeAnAliquot(mete<3, never>) << '\n';
+    std::cout << "  never 0:   " << TimeAnAliquot(mete<0,never>) << '\n';
+    std::cout << "  never 1:   " << TimeAnAliquot(mete<1,never>) << '\n';
+    std::cout << "  never 2:   " << TimeAnAliquot(mete<2,never>) << '\n';
+    std::cout << "  never 3:   " << TimeAnAliquot(mete<3,never>) << '\n';
     std::cout << '\n';
 }
 
diff --git a/round_to.hpp b/round_to.hpp
index ba5540e..a5a7a58 100644
--- a/round_to.hpp
+++ b/round_to.hpp
@@ -280,7 +280,7 @@ RealType erroneous_rounding_function(RealType)
 
 template<typename RealType>
 class round_to
-    :public std::unary_function<RealType, RealType>
+    :public std::unary_function<RealType,RealType>
 {
     static_assert(std::is_floating_point<RealType>::value, "");
 
diff --git a/tier_view.cpp b/tier_view.cpp
index ce841c3..85edf00 100644
--- a/tier_view.cpp
+++ b/tier_view.cpp
@@ -122,7 +122,7 @@ MultiDimGrid* TierView::CreateGridCtrl(wxWindow* parent)
 
 void TierView::SetupControls()
 {
-    std::map<e_stratified, wxTreeItemId> index_to_id;
+    std::map<e_stratified,wxTreeItemId> index_to_id;
 
     wxTreeCtrl& tree_ctrl = tree();
 
diff --git a/tier_view_editor.hpp b/tier_view_editor.hpp
index cd6c06c..3af3b15 100644
--- a/tier_view_editor.hpp
+++ b/tier_view_editor.hpp
@@ -59,7 +59,7 @@
 class tier_entity_adapter
 {
   public:
-    typedef std::pair<double, double> double_pair;
+    typedef std::pair<double,double> double_pair;
 
     /// We can't store a pointer/reference to stratified_entity because
     /// stratified_entity has private interface for accessing
diff --git a/zero.hpp b/zero.hpp
index fc1b4e2..7ac9f1b 100644
--- a/zero.hpp
+++ b/zero.hpp
@@ -45,7 +45,7 @@ enum root_bias
     ,bias_higher // Require  0.0 <= f(z).
     };
 
-typedef std::pair<double, root_validity> root_type;
+typedef std::pair<double,root_validity> root_type;
 
 /// Return a zero z of a function f within input bounds [a,b].
 ///