[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 84cd25c 1/2: Remove stray spaces in template
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 84cd25c 1/2: Remove stray spaces in template declarations and specializations |
|
Date: |
Thu, 2 Mar 2017 12:32:54 -0500 (EST) |
branch: master
commit 84cd25cef0de311cc51d8034279673fc027e8e6c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Remove stray spaces in template declarations and specializations
Removed space in '> >': C++ no longer requires it.
Regularized spacing in template parameters lists. Generally, lmi has
a space after the comma only in declarations:
template<typename T, typename U> // space after comma
but not in instantiations [not systematically changed in this commit]:
std::pair<T,U> // no space after comma
or in specializations:
template<> struct foo<T,U> // no space after comma
---
any_member.hpp | 6 +++---
any_member_test.cpp | 4 ++--
cache_file_reads.hpp | 2 +-
calendar_date.cpp | 2 +-
callback.hpp | 2 +-
ce_product_name.hpp | 4 ++--
ce_skin_name.hpp | 4 ++--
census_view.cpp | 6 +++---
contains_test.cpp | 6 +++---
gpt_input.hpp | 2 +-
group_values.cpp | 2 +-
input.hpp | 10 +++++-----
input_sequence_aux.hpp | 6 +++---
ledger_base.hpp | 6 +++---
ledger_xml_io.cpp | 4 ++--
loads.hpp | 20 ++++++++++----------
mc_enum.hpp | 6 +++---
mc_enum_aux.hpp | 2 +-
mec_input.hpp | 2 +-
multidimgrid_tools.hpp | 2 +-
multiple_cell_document.cpp | 2 +-
null_stream.cpp | 4 ++--
preferences_model.hpp | 2 +-
tn_range.hpp | 6 +++---
tn_range_test.cpp | 30 +++++++++++++++---------------
tn_range_test_aux.cpp | 2 +-
tn_range_test_aux.hpp | 4 ++--
tn_range_types.cpp | 24 ++++++++++++------------
tn_range_types.hpp | 24 ++++++++++++------------
xml_serialize.hpp | 6 +++---
30 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/any_member.hpp b/any_member.hpp
index eaa0f7d..c02d047 100644
--- a/any_member.hpp
+++ b/any_member.hpp
@@ -110,7 +110,7 @@ inline placeholder::~placeholder() = default;
template<typename ClassType, typename ValueType>
class holder
:public placeholder
- ,private lmi::uncopyable<holder<ClassType,ValueType> >
+ ,private lmi::uncopyable<holder<ClassType,ValueType>>
{
// Friendship is extended to class any_member only to support its
// cast operations.
@@ -523,9 +523,9 @@ MemberType const* member_cast(any_member<ClassType> const&
member)
template<typename ClassType>
class MemberSymbolTable
- :private lmi::uncopyable<MemberSymbolTable<ClassType> >
+ :private lmi::uncopyable<MemberSymbolTable<ClassType>>
{
- typedef std::map<std::string, any_member<ClassType> > member_map_type;
+ typedef std::map<std::string, any_member<ClassType>> member_map_type;
typedef typename member_map_type::value_type member_pair_type;
public:
diff --git a/any_member_test.cpp b/any_member_test.cpp
index d83e318..176da40 100644
--- a/any_member_test.cpp
+++ b/any_member_test.cpp
@@ -163,7 +163,7 @@ std::ostream& S::write(std::ostream& os)
template<typename D>
class V
{
- typedef std::map<std::string, any_member<D> > member_map;
+ typedef std::map<std::string, any_member<D>> member_map;
};
class U
@@ -205,7 +205,7 @@ struct T : public Q, public MemberSymbolTable<T>
}
};
-template<> struct reconstitutor<base_datum, S>
+template<> struct reconstitutor<base_datum,S>
{
typedef base_datum DesiredType;
static DesiredType* reconstitute(any_member<S>& m)
diff --git a/cache_file_reads.hpp b/cache_file_reads.hpp
index f9ade75..1f2b556 100644
--- a/cache_file_reads.hpp
+++ b/cache_file_reads.hpp
@@ -58,7 +58,7 @@ namespace detail
template<typename T>
class file_cache
- :private lmi::uncopyable<file_cache<T> >
+ :private lmi::uncopyable<file_cache<T>>
{
public:
using retrieved_type = std::shared_ptr<T>;
diff --git a/calendar_date.cpp b/calendar_date.cpp
index 6a15c71..07ec368 100644
--- a/calendar_date.cpp
+++ b/calendar_date.cpp
@@ -760,7 +760,7 @@ std::string month_name(int month)
c_time.tm_mon = month - 1;
char format[] = "%B";
std::ostringstream oss;
- std::use_facet<std::time_put<char> >(oss.getloc()).put
+ std::use_facet<std::time_put<char>>(oss.getloc()).put
(std::ostreambuf_iterator<char>(oss.rdbuf())
,oss
,'\0'
diff --git a/callback.hpp b/callback.hpp
index d55750a..03ceb86 100644
--- a/callback.hpp
+++ b/callback.hpp
@@ -96,7 +96,7 @@
template<typename FunctionPointer>
class LMI_SO callback final
- :private lmi::uncopyable <callback<FunctionPointer> >
+ :private lmi::uncopyable <callback<FunctionPointer>>
{
static_assert(std::is_pointer<FunctionPointer>::value, "");
typedef typename std::remove_pointer<FunctionPointer>::type f_type;
diff --git a/ce_product_name.hpp b/ce_product_name.hpp
index 3b01234..38b6e44 100644
--- a/ce_product_name.hpp
+++ b/ce_product_name.hpp
@@ -53,8 +53,8 @@
class ce_product_name
:public mc_enum_base
- ,private boost::equality_comparable<ce_product_name, ce_product_name>
- ,private boost::equality_comparable<ce_product_name, std::string>
+ ,private boost::equality_comparable<ce_product_name,ce_product_name>
+ ,private boost::equality_comparable<ce_product_name,std::string>
{
public:
ce_product_name();
diff --git a/ce_skin_name.hpp b/ce_skin_name.hpp
index 068c62a..2f64306 100644
--- a/ce_skin_name.hpp
+++ b/ce_skin_name.hpp
@@ -45,8 +45,8 @@
class ce_skin_name
:public mc_enum_base
- ,private boost::equality_comparable<ce_skin_name, ce_skin_name>
- ,private boost::equality_comparable<ce_skin_name, std::string>
+ ,private boost::equality_comparable<ce_skin_name,ce_skin_name>
+ ,private boost::equality_comparable<ce_skin_name,std::string>
{
public:
ce_skin_name();
diff --git a/census_view.cpp b/census_view.cpp
index d752c32..98e0235 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -1042,7 +1042,7 @@ void CensusView::update_class_names()
std::vector<std::string> unique_class_names;
- std::insert_iterator<std::vector<std::string> > iin
+ std::insert_iterator<std::vector<std::string>> iin
(unique_class_names
,unique_class_names.begin()
);
@@ -1094,7 +1094,7 @@ void CensusView::update_class_names()
// Replace the vector of class parameters with the one we rebuilt.
class_parms().clear();
- std::insert_iterator<std::vector<Input> > iip(class_parms(),
class_parms().begin());
+ std::insert_iterator<std::vector<Input>> iip(class_parms(),
class_parms().begin());
std::copy(rebuilt_class_parms.begin(), rebuilt_class_parms.end(), iip);
}
@@ -1774,7 +1774,7 @@ void CensusView::UponPasteCensus(wxCommandEvent&)
}
auto selection = cell_parms().size();
- std::back_insert_iterator<std::vector<Input> > iip(cell_parms());
+ std::back_insert_iterator<std::vector<Input>> iip(cell_parms());
std::copy(cells.begin(), cells.end(), iip);
document().Modify(true);
list_model_->Reset(cell_parms().size());
diff --git a/contains_test.cpp b/contains_test.cpp
index 593ca5e..94d9741 100644
--- a/contains_test.cpp
+++ b/contains_test.cpp
@@ -44,9 +44,9 @@ void test_has_member_find()
static_assert( has_member_find<std::string>::value, "");
- static_assert( has_member_find<std::map <int,int> >::value, "");
- static_assert( has_member_find<std::set <int > >::value, "");
- static_assert(!has_member_find<std::vector<int > >::value, "");
+ static_assert( has_member_find<std::map <int,int>>::value, "");
+ static_assert( has_member_find<std::set <int >>::value, "");
+ static_assert(!has_member_find<std::vector<int >>::value, "");
}
/// Test standard "containers" for which find() makes sense.
diff --git a/gpt_input.hpp b/gpt_input.hpp
index 42e6a1f..8d0e22f 100644
--- a/gpt_input.hpp
+++ b/gpt_input.hpp
@@ -220,7 +220,7 @@ class LMI_SO gpt_input final
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its UDTs share.
-template<> struct reconstitutor<datum_base, gpt_input>
+template<> struct reconstitutor<datum_base,gpt_input>
{
typedef datum_base DesiredType;
static DesiredType* reconstitute(any_member<gpt_input>& m)
diff --git a/group_values.cpp b/group_values.cpp
index 4715ed7..144ae39 100644
--- a/group_values.cpp
+++ b/group_values.cpp
@@ -250,7 +250,7 @@ census_run_result run_census_in_parallel::operator()
ledger_emitter emitter(file, emission);
- std::vector<std::shared_ptr<AccountValue> > cell_values;
+ std::vector<std::shared_ptr<AccountValue>> cell_values;
std::vector<mcenum_run_basis> const& RunBases = composite.GetRunBases();
int const first_cell_inforce_year =
value_cast<int>((*cells.begin())["InforceYear"].str());
diff --git a/input.hpp b/input.hpp
index 3b2b09e..ebe218d 100644
--- a/input.hpp
+++ b/input.hpp
@@ -53,7 +53,7 @@ class product_database;
/// input.
///
/// The MVC framework uses two distinct data structures. One is simply
-/// a std::map<std::string>,std::string> > member of the Controller;
+/// a std::map<std::string>,std::string>> member of the Controller;
/// it captures user input exactly. The other, this class, holds data
/// of various types that a real program might capture from GUI input
/// and use downstream. These two data structures are distinct because
@@ -473,7 +473,7 @@ class LMI_SO Input final
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its input sequences share.
-template<> struct reconstitutor<datum_sequence, Input>
+template<> struct reconstitutor<datum_sequence,Input>
{
typedef datum_sequence DesiredType;
static DesiredType* reconstitute(any_member<Input>& m)
@@ -491,7 +491,7 @@ template<> struct reconstitutor<datum_sequence, Input>
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its mc_enum types share.
-template<> struct reconstitutor<mc_enum_base, Input>
+template<> struct reconstitutor<mc_enum_base,Input>
{
typedef mc_enum_base DesiredType;
static DesiredType* reconstitute(any_member<Input>& m)
@@ -537,7 +537,7 @@ template<> struct reconstitutor<mc_enum_base, Input>
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its tn_range types share.
-template<> struct reconstitutor<tn_range_base, Input>
+template<> struct reconstitutor<tn_range_base,Input>
{
typedef tn_range_base DesiredType;
static DesiredType* reconstitute(any_member<Input>& m)
@@ -559,7 +559,7 @@ template<> struct reconstitutor<tn_range_base, Input>
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its UDTs share.
-template<> struct reconstitutor<datum_base, Input>
+template<> struct reconstitutor<datum_base,Input>
{
typedef datum_base DesiredType;
static DesiredType* reconstitute(any_member<Input>& m)
diff --git a/input_sequence_aux.hpp b/input_sequence_aux.hpp
index b6ecd19..0bc09f7 100644
--- a/input_sequence_aux.hpp
+++ b/input_sequence_aux.hpp
@@ -43,7 +43,7 @@
namespace detail
{
typedef
- std::map<std::string, std::string, std::less<std::string> >
+ std::map<std::string, std::string, std::less<std::string>>
stringmap
;
@@ -106,7 +106,7 @@ namespace detail
template<typename T>
std::vector<T> convert_vector_type
- (std::vector<mc_enum<T> > const& ve
+ (std::vector<mc_enum<T>> const& ve
,typename std::enable_if<std::is_enum<T>::value>::type* = nullptr
)
{
@@ -120,7 +120,7 @@ std::vector<T> convert_vector_type
template<typename Number, typename Trammel>
std::vector<Number> convert_vector_type
- (std::vector<tn_range<Number,Trammel> > const& vr
+ (std::vector<tn_range<Number,Trammel>> const& vr
)
{
std::vector<Number> z;
diff --git a/ledger_base.hpp b/ledger_base.hpp
index d24a332..e0e2100 100644
--- a/ledger_base.hpp
+++ b/ledger_base.hpp
@@ -166,9 +166,9 @@ class CRC;
///
/// We choose 3.a., which impels us to choose 2.a.
-typedef std::map<std::string, std::vector<double>*, std::less<std::string> >
double_vector_map;
-typedef std::map<std::string, std::string*, std::less<std::string> >
string_map;
-typedef std::map<std::string, double*, std::less<std::string> > scalar_map;
+typedef std::map<std::string, std::vector<double>*, std::less<std::string>>
double_vector_map;
+typedef std::map<std::string, std::string*, std::less<std::string>> string_map;
+typedef std::map<std::string, double*, std::less<std::string>> scalar_map;
class LMI_SO LedgerBase
{
diff --git a/ledger_xml_io.cpp b/ledger_xml_io.cpp
index bb55285..528211d 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
@@ -704,7 +704,7 @@ void Ledger::write(xml::element& x) const
// Maps to hold the results of formatting numeric data.
std::map<std::string, std::string> stringscalars;
- std::map<std::string, std::vector<std::string> > stringvectors;
+ std::map<std::string, std::vector<std::string>> stringvectors;
stringvectors["FundNames"] = ledger_invariant_->FundNames;
diff --git a/loads.hpp b/loads.hpp
index dae6252..f4b12f8 100644
--- a/loads.hpp
+++ b/loads.hpp
@@ -82,16 +82,16 @@ class Loads
std::vector<double> refundable_sales_load_proportion_;
- std::vector<std::vector<double> > monthly_policy_fee_;
- std::vector<std::vector<double> > annual_policy_fee_;
- std::vector<std::vector<double> > specified_amount_load_;
- std::vector<std::vector<double> > separate_account_load_;
- std::vector<std::vector<double> > target_premium_load_;
- std::vector<std::vector<double> > excess_premium_load_;
- std::vector<std::vector<double> > target_sales_load_;
- std::vector<std::vector<double> > excess_sales_load_;
- std::vector<std::vector<double> > target_total_load_;
- std::vector<std::vector<double> > excess_total_load_;
+ std::vector<std::vector<double>> monthly_policy_fee_;
+ std::vector<std::vector<double>> annual_policy_fee_;
+ std::vector<std::vector<double>> specified_amount_load_;
+ std::vector<std::vector<double>> separate_account_load_;
+ std::vector<std::vector<double>> target_premium_load_;
+ std::vector<std::vector<double>> excess_premium_load_;
+ std::vector<std::vector<double>> target_sales_load_;
+ std::vector<std::vector<double>> excess_sales_load_;
+ std::vector<std::vector<double>> target_total_load_;
+ std::vector<std::vector<double>> excess_total_load_;
std::vector<double> premium_tax_load_;
std::vector<double> amortized_premium_tax_load_;
diff --git a/mc_enum.hpp b/mc_enum.hpp
index 94924ac..f9a35fd 100644
--- a/mc_enum.hpp
+++ b/mc_enum.hpp
@@ -94,9 +94,9 @@ class LMI_SO mc_enum_base
template<typename T>
class mc_enum
:public mc_enum_base
- ,private boost::equality_comparable<mc_enum<T>, mc_enum<T> >
- ,private boost::equality_comparable<mc_enum<T>, T >
- ,private boost::equality_comparable<mc_enum<T>, std::string>
+ ,private boost::equality_comparable<mc_enum<T>,mc_enum<T>>
+ ,private boost::equality_comparable<mc_enum<T>,T>
+ ,private boost::equality_comparable<mc_enum<T>,std::string>
{
static_assert(std::is_enum<T>::value, "");
diff --git a/mc_enum_aux.hpp b/mc_enum_aux.hpp
index b0ef6c5..585bd0f 100644
--- a/mc_enum_aux.hpp
+++ b/mc_enum_aux.hpp
@@ -31,7 +31,7 @@
template<typename T>
std::vector<std::string> mc_e_vector_to_string_vector
- (std::vector<mc_enum<T> > const& ve
+ (std::vector<mc_enum<T>> const& ve
)
{
std::vector<std::string> vs;
diff --git a/mec_input.hpp b/mec_input.hpp
index 041b6da..bed78ac 100644
--- a/mec_input.hpp
+++ b/mec_input.hpp
@@ -188,7 +188,7 @@ class LMI_SO mec_input final
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its UDTs share.
-template<> struct reconstitutor<datum_base, mec_input>
+template<> struct reconstitutor<datum_base,mec_input>
{
typedef datum_base DesiredType;
static DesiredType* reconstitute(any_member<mec_input>& m)
diff --git a/multidimgrid_tools.hpp b/multidimgrid_tools.hpp
index 69688df..b445af1 100644
--- a/multidimgrid_tools.hpp
+++ b/multidimgrid_tools.hpp
@@ -87,7 +87,7 @@ class AxisMaxBoundAdjusterBase
template<typename Integral>
class AxisMaxBoundAdjuster
:public AxisMaxBoundAdjusterBase
- ,private lmi::uncopyable<AxisMaxBoundAdjuster<Integral> >
+ ,private lmi::uncopyable<AxisMaxBoundAdjuster<Integral>>
{
public:
AxisMaxBoundAdjuster
diff --git a/multiple_cell_document.cpp b/multiple_cell_document.cpp
index 09681fb..c602eb4 100644
--- a/multiple_cell_document.cpp
+++ b/multiple_cell_document.cpp
@@ -150,7 +150,7 @@ void multiple_cell_document::parse(xml_lmi::dom_parser
const& parser)
( ("case_default" == tag) ? case_parms_
: ("class_defaults" == tag) ? class_parms_
: ("particular_cells" == tag) ? cell_parms_
- : hurl<std::vector<Input> >("Unexpected element '" + tag + "'.")
+ : hurl<std::vector<Input>>("Unexpected element '" + tag + "'.")
);
xml::const_nodes_view const subelements(i.elements());
v.reserve(subelements.size());
diff --git a/null_stream.cpp b/null_stream.cpp
index 7fdcac7..8d883cf 100644
--- a/null_stream.cpp
+++ b/null_stream.cpp
@@ -38,10 +38,10 @@
/// described in 'ChangeLog'; any defect in it should not reflect on
/// Dietmar Kuehl's reputation.
-template<typename CharType, typename traits = std::char_traits<CharType> >
+template<typename CharType, typename traits = std::char_traits<CharType>>
class dev_null_stream_buffer
:public std::streambuf
- ,private lmi::uncopyable<dev_null_stream_buffer<CharType,traits> >
+ ,private lmi::uncopyable<dev_null_stream_buffer<CharType,traits>>
{
public:
dev_null_stream_buffer()
diff --git a/preferences_model.hpp b/preferences_model.hpp
index c06691c..dcd82c2 100644
--- a/preferences_model.hpp
+++ b/preferences_model.hpp
@@ -89,7 +89,7 @@ class LMI_SO PreferencesModel final
/// Specialization of struct template reconstitutor for this Model
/// and the base class that all its UDTs share.
-template<> struct reconstitutor<datum_base, PreferencesModel>
+template<> struct reconstitutor<datum_base,PreferencesModel>
{
typedef datum_base DesiredType;
static DesiredType* reconstitute(any_member<PreferencesModel>& m)
diff --git a/tn_range.hpp b/tn_range.hpp
index 3227d22..5bad13b 100644
--- a/tn_range.hpp
+++ b/tn_range.hpp
@@ -230,9 +230,9 @@ class LMI_SO tn_range_base
template<typename Number, typename Trammel>
class tn_range
:public tn_range_base
- ,private boost::totally_ordered <tn_range<Number,Trammel> >
- ,private boost::equality_comparable<tn_range<Number,Trammel>, Number>
- ,private boost::equality_comparable<tn_range<Number,Trammel>, std::string>
+ ,private boost::totally_ordered <tn_range<Number,Trammel>>
+ ,private boost::equality_comparable<tn_range<Number,Trammel>,Number>
+ ,private boost::equality_comparable<tn_range<Number,Trammel>,std::string>
{
static_assert(std::is_base_of<trammel_base<Number>,Trammel>::value, "");
diff --git a/tn_range_test.cpp b/tn_range_test.cpp
index d070660..af4c04b 100644
--- a/tn_range_test.cpp
+++ b/tn_range_test.cpp
@@ -34,7 +34,7 @@
// template class tn_range<double, std::string>;
// This should fail to compile:
-// tn_range<bool, percentage_trammel<bool> > boolean_percentage;
+// tn_range<bool, percentage_trammel<bool>> boolean_percentage;
template<typename T>
class nonnegative
@@ -45,8 +45,8 @@ class nonnegative
T nominal_maximum() const override {return std::numeric_limits<T>::max();}
};
-template class tn_range<double, nonnegative<double> >;
-typedef tn_range<double, nonnegative<double> > r_nonnegative;
+template class tn_range<double, nonnegative<double>>;
+typedef tn_range<double, nonnegative<double>> r_nonnegative;
/// One reasonable interpretation of an "unbounded" floating-point
/// range encompasses only normalized values that are nonsingular.
@@ -60,25 +60,25 @@ class unbounded
T nominal_maximum() const override {return std::numeric_limits<T>::max();}
};
-template class tn_range<double, unbounded<double> >;
-typedef tn_range<double, unbounded<double> > r_unbounded;
+template class tn_range<double, unbounded<double>>;
+typedef tn_range<double, unbounded<double>> r_unbounded;
// Range type 'r_int_percentage' is explicitly instantiated in a
// different translation unit. A different template class with the
// same trammel type can be instantiated here:
-typedef tn_range<double, percentage_trammel<double> > r_double_percentage;
-template class tn_range<double, percentage_trammel<double> >;
+typedef tn_range<double, percentage_trammel<double>> r_double_percentage;
+template class tn_range<double, percentage_trammel<double>>;
// Although character and unsigned types aren't expected to be very
// useful as the first template parameter of class template tn_range,
// instantiating and testing examples here ensures that they work.
-typedef tn_range<signed char, percentage_trammel<signed char> >
r_signed_char_percentage;
-template class tn_range<signed char, percentage_trammel<signed char> >;
+typedef tn_range<signed char, percentage_trammel<signed char>>
r_signed_char_percentage;
+template class tn_range<signed char, percentage_trammel<signed char>>;
-typedef tn_range<unsigned int, percentage_trammel<unsigned int> >
r_unsigned_int_percentage;
-template class tn_range<unsigned int, percentage_trammel<unsigned int> >;
+typedef tn_range<unsigned int, percentage_trammel<unsigned int>>
r_unsigned_int_percentage;
+template class tn_range<unsigned int, percentage_trammel<unsigned int>>;
// This range type's bounds aren't exactly representable in binary.
// See the inline discussion where it is tested.
@@ -92,8 +92,8 @@ class surd
T nominal_maximum() const override {return 0.070000000000000001;}
};
-template class tn_range<double, surd<double> >;
-typedef tn_range<double, surd<double> > r_surd;
+template class tn_range<double, surd<double>>;
+typedef tn_range<double, surd<double>> r_surd;
/// An exception should be thrown if an attempt is made to use an
/// object of type 'r_absurd', because its limits are crossed.
@@ -107,8 +107,8 @@ class absurd
T nominal_maximum() const override {return 0;}
};
-template class tn_range<int, absurd<int> >;
-typedef tn_range<int, absurd<int> > r_absurd;
+template class tn_range<int, absurd<int>>;
+typedef tn_range<int, absurd<int>> r_absurd;
struct tn_range_test
{
diff --git a/tn_range_test_aux.cpp b/tn_range_test_aux.cpp
index 13c5c83..4783a06 100644
--- a/tn_range_test_aux.cpp
+++ b/tn_range_test_aux.cpp
@@ -29,5 +29,5 @@
// such template in a different translation unit than the unit-test
// driver, in order to prove that explicit instantiation works.
-template class tn_range<int, percentage_trammel<int> >;
+template class tn_range<int, percentage_trammel<int>>;
diff --git a/tn_range_test_aux.hpp b/tn_range_test_aux.hpp
index 3b28686..16197af 100644
--- a/tn_range_test_aux.hpp
+++ b/tn_range_test_aux.hpp
@@ -43,7 +43,7 @@ class percentage_trammel
T nominal_maximum() const override {return 100;}
};
-typedef tn_range<int, percentage_trammel<int> > r_int_percentage;
+typedef tn_range<int, percentage_trammel<int>> r_int_percentage;
/// Class RangeUDT demonstrates the requirements for the Number
/// parameter of class template tn_range. It must be:
@@ -87,7 +87,7 @@ class range_udt_trammel
T nominal_maximum() const override {return 100;}
};
-typedef tn_range<RangeUDT, range_udt_trammel<RangeUDT> > r_range_udt;
+typedef tn_range<RangeUDT, range_udt_trammel<RangeUDT>> r_range_udt;
#endif // tn_range_test_aux_hpp
diff --git a/tn_range_types.cpp b/tn_range_types.cpp
index f8c74bc..a874e89 100644
--- a/tn_range_types.cpp
+++ b/tn_range_types.cpp
@@ -30,18 +30,18 @@
// SOMEDAY !! Move these two to a 'test' file.
-template class tn_range<int , percentage_trammel <int >
>;
-template class tn_range<double , percentage_trammel <double >
>;
-
-template class tn_range<double , unrestricted_trammel <double >
>;
-template class tn_range<double , proportion_trammel <double >
>;
-template class tn_range<double , nonnegative_trammel <double >
>;
-template class tn_range<int , nonnegative_trammel <int >
>;
-template class tn_range<int , age_trammel <int >
>;
-template class tn_range<int , duration_trammel <int >
>;
-template class tn_range<int , month_trammel <int >
>;
-template class tn_range<double , corridor_factor_trammel<double >
>;
-template class tn_range<calendar_date, date_trammel <calendar_date>
>;
+template class tn_range<int , percentage_trammel <int >>;
+template class tn_range<double , percentage_trammel <double >>;
+
+template class tn_range<double , unrestricted_trammel <double >>;
+template class tn_range<double , proportion_trammel <double >>;
+template class tn_range<double , nonnegative_trammel <double >>;
+template class tn_range<int , nonnegative_trammel <int >>;
+template class tn_range<int , age_trammel <int >>;
+template class tn_range<int , duration_trammel <int >>;
+template class tn_range<int , month_trammel <int >>;
+template class tn_range<double , corridor_factor_trammel<double >>;
+template class tn_range<calendar_date, date_trammel <calendar_date>>;
// Explicitly instantiate trammel_base for every type actually used.
// Otherwise, its specialized members (minimum_minimorum(), e.g.)
diff --git a/tn_range_types.hpp b/tn_range_types.hpp
index 524107f..59b23dc 100644
--- a/tn_range_types.hpp
+++ b/tn_range_types.hpp
@@ -29,18 +29,18 @@
// SOMEDAY !! Move these two to a 'test' file.
-typedef tn_range<int , percentage_trammel <int > >
r_int_percentage;
-typedef tn_range<double , percentage_trammel <double > >
r_double_percentage;
-
-typedef tn_range<double , unrestricted_trammel <double > >
tnr_unrestricted_double;
-typedef tn_range<double , proportion_trammel <double > >
tnr_proportion;
-typedef tn_range<double , nonnegative_trammel <double > >
tnr_nonnegative_double;
-typedef tn_range<int , nonnegative_trammel <int > >
tnr_nonnegative_integer;
-typedef tn_range<int , age_trammel <int > >
tnr_age;
-typedef tn_range<int , duration_trammel <int > >
tnr_duration;
-typedef tn_range<int , month_trammel <int > >
tnr_month;
-typedef tn_range<double , corridor_factor_trammel<double > >
tnr_corridor_factor;
-typedef tn_range<calendar_date, date_trammel <calendar_date> >
tnr_date;
+typedef tn_range<int , percentage_trammel <int >>
r_int_percentage;
+typedef tn_range<double , percentage_trammel <double >>
r_double_percentage;
+
+typedef tn_range<double , unrestricted_trammel <double >>
tnr_unrestricted_double;
+typedef tn_range<double , proportion_trammel <double >>
tnr_proportion;
+typedef tn_range<double , nonnegative_trammel <double >>
tnr_nonnegative_double;
+typedef tn_range<int , nonnegative_trammel <int >>
tnr_nonnegative_integer;
+typedef tn_range<int , age_trammel <int >>
tnr_age;
+typedef tn_range<int , duration_trammel <int >>
tnr_duration;
+typedef tn_range<int , month_trammel <int >>
tnr_month;
+typedef tn_range<double , corridor_factor_trammel<double >>
tnr_corridor_factor;
+typedef tn_range<calendar_date, date_trammel <calendar_date>>
tnr_date;
#endif // tn_range_types_hpp
diff --git a/xml_serialize.hpp b/xml_serialize.hpp
index 072ead8..5fb9aa8 100644
--- a/xml_serialize.hpp
+++ b/xml_serialize.hpp
@@ -89,7 +89,7 @@ template<typename T>
struct xml_sequence_io
{
typedef typename T::value_type item_t;
- static_assert(std::is_same<T,std::vector<item_t> >::value, "");
+ static_assert(std::is_same<T,std::vector<item_t>>::value, "");
static void to_xml(xml::element& e, T const& t)
{
@@ -117,8 +117,8 @@ struct xml_sequence_io
};
template<typename T>
-struct xml_io<std::vector<T> >
- :public xml_sequence_io<std::vector<T> >
+struct xml_io<std::vector<T>>
+ :public xml_sequence_io<std::vector<T>>
{};
/// Serialize a datum into a subelement of the given xml element.