[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 0328e05 2/2: Omit "std::" from comments stati
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 0328e05 2/2: Omit "std::" from comments stating reasons for including headers |
|
Date: |
Thu, 29 Jun 2017 09:22:14 -0400 (EDT) |
branch: master
commit 0328e05791afa159fa885d494aa0f0833e80e55f
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Omit "std::" from comments stating reasons for including headers
"std::" is pleonastic in the case of standard C++ headers, and improper
otherwise.
---
account_value.hpp | 2 +-
accountvalue.cpp | 6 +++---
actuarial_table.cpp | 4 ++--
actuarial_table_test.cpp | 2 +-
alert.cpp | 2 +-
alert_cgi.cpp | 2 +-
alert_cli.cpp | 2 +-
alert_test.cpp | 2 +-
any_member.hpp | 2 +-
any_member_test.cpp | 2 +-
authenticity.cpp | 6 +++---
authenticity_test.cpp | 4 ++--
basic_values.hpp | 4 ++--
basicvalues.cpp | 4 ++--
bcc_ar.cpp | 2 +-
bcc_ld.cpp | 2 +-
bourn_cast.hpp | 2 +-
cache_file_reads.hpp | 6 +++---
calendar_date.cpp | 6 +++---
ce_product_name.cpp | 2 +-
ce_product_name.hpp | 2 +-
ce_skin_name.cpp | 2 +-
ce_skin_name.hpp | 2 +-
census_view.cpp | 6 +++---
census_view.hpp | 2 +-
commutation_functions.cpp | 8 ++++----
commutation_functions_test.cpp | 10 +++++-----
configurable_settings.cpp | 2 +-
contains.hpp | 4 ++--
contains_test.cpp | 2 +-
cpp_main.cpp | 2 +-
crc32.hpp | 2 +-
currency_test.cpp | 2 +-
database.cpp | 2 +-
database.hpp | 2 +-
database_view.hpp | 2 +-
database_view_editor.cpp | 2 +-
database_view_editor.hpp | 2 +-
dbvalue.cpp | 6 +++---
death_benefits.cpp | 2 +-
deserialize_cast.hpp | 2 +-
docmanager_ex.hpp | 2 +-
emit_ledger.hpp | 2 +-
expression_template_0_test.cpp | 4 ++--
facets.cpp | 2 +-
fenv_lmi_test.cpp | 2 +-
file_command_wx.cpp | 2 +-
financial.cpp | 6 +++---
financial_test.cpp | 4 ++--
getopt.cpp | 4 ++--
gpt_commutation_functions.cpp | 4 ++--
gpt_input.cpp | 4 ++--
gpt_input.hpp | 2 +-
gpt_server.cpp | 2 +-
gpt_test.cpp | 2 +-
group_quote_pdf_gen.hpp | 2 +-
group_quote_pdf_gen_wx.cpp | 6 +++---
group_values.cpp | 4 ++--
group_values.hpp | 2 +-
handle_exceptions.hpp | 2 +-
ihs_acctval.cpp | 4 ++--
ihs_avdebug.cpp | 2 +-
ihs_avmly.cpp | 4 ++--
ihs_avsolve.cpp | 4 ++--
ihs_basicval.cpp | 4 ++--
ihs_irc7702.hpp | 2 +-
ihs_irc7702a.cpp | 2 +-
ihs_mortal.cpp | 2 +-
illustration_view.hpp | 2 +-
illustrator.hpp | 2 +-
input.hpp | 2 +-
input_harmonization.cpp | 4 ++--
input_realization.cpp | 4 ++--
input_sequence.cpp | 2 +-
input_sequence_entry.cpp | 4 ++--
input_sequence_parser.cpp | 6 +++---
input_sequence_test.cpp | 2 +-
input_test.cpp | 4 ++--
input_xml_io.cpp | 4 ++--
interest_rates.cpp | 4 ++--
istream_to_string_test.cpp | 2 +-
ledger.hpp | 2 +-
ledger_base.cpp | 6 +++---
ledger_base.hpp | 6 +++---
ledger_xml_io.cpp | 6 +++---
ledgervalues.hpp | 2 +-
loads_test.cpp | 4 ++--
main_cgi.cpp | 2 +-
main_cli.cpp | 4 ++--
main_common.cpp | 2 +-
main_wx_test.cpp | 4 ++--
math_functors.hpp | 4 ++--
math_functors_test.cpp | 4 ++--
mc_enum.cpp | 2 +-
mc_enum.hpp | 2 +-
mc_enum.tpp | 2 +-
mc_enum_metadata.hpp | 2 +-
mc_enum_types_aux.cpp | 2 +-
md5.hpp | 2 +-
mec_input.cpp | 4 ++--
mec_input.hpp | 2 +-
mec_server.cpp | 2 +-
miscellany.cpp | 4 ++--
miscellany.hpp | 4 ++--
miscellany_test.cpp | 2 +-
mortality_rates.cpp | 2 +-
msw_workarounds.cpp | 4 ++--
multidimgrid_any.hpp | 6 +++---
mvc_controller.cpp | 4 ++--
name_value_pairs_test.cpp | 2 +-
numeric_io_cast.hpp | 4 ++--
numeric_io_test.cpp | 2 +-
numeric_io_traits.hpp | 8 ++++----
path_utility.cpp | 2 +-
path_utility_test.cpp | 2 +-
preferences_model.cpp | 2 +-
premium_tax.cpp | 2 +-
print_matrix.hpp | 4 ++--
progress_meter.hpp | 2 +-
progress_meter_wx.cpp | 2 +-
rate_table.cpp | 8 ++++----
rate_table.hpp | 4 ++--
rate_table_test.cpp | 2 +-
rate_table_tool.cpp | 14 +++++++-------
round_test.cpp | 6 +++---
round_to_test.cpp | 4 ++--
rounding_view_editor.cpp | 2 +-
rtti_lmi.hpp | 2 +-
skeleton.cpp | 2 +-
snprintf_test.cpp | 2 +-
solve.cpp | 2 +-
stl_extensions.hpp | 4 ++--
stratified_algorithms.hpp | 2 +-
stratified_algorithms_test.cpp | 2 +-
stream_cast.hpp | 2 +-
system_command_test.cpp | 2 +-
system_command_wx.cpp | 2 +-
test_coding_rules.cpp | 6 +++---
tier_view.hpp | 2 +-
tier_view_editor.hpp | 4 ++--
timer_test.cpp | 2 +-
tn_range.tpp | 2 +-
tn_range_test.cpp | 2 +-
value_cast_test.cpp | 4 ++--
vector_test.cpp | 2 +-
view_ex.cpp | 2 +-
wx_new.hpp | 2 +-
wx_table_generator.hpp | 2 +-
wx_test_benchmark_census.cpp | 2 +-
wx_test_calculation_summary.cpp | 2 +-
wx_test_input_sequences.cpp | 2 +-
wx_utility.cpp | 2 +-
xml_lmi.hpp | 4 ++--
xml_serializable.tpp | 4 ++--
yare_input.cpp | 2 +-
155 files changed, 244 insertions(+), 244 deletions(-)
diff --git a/account_value.hpp b/account_value.hpp
index 8793371..1ef450f 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -30,7 +30,7 @@
#include <fstream>
#include <iosfwd>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
#include <vector>
diff --git a/accountvalue.cpp b/accountvalue.cpp
index b99134b..779830d 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -37,9 +37,9 @@
#include "mortality_rates.hpp"
#include "outlay.hpp"
-#include <algorithm> // std::max(), std::min()
-#include <cmath> // std::pow()
-#include <numeric> // std::accumulate()
+#include <algorithm> // max(), min()
+#include <cmath> // pow()
+#include <numeric> // accumulate()
namespace
{
diff --git a/actuarial_table.cpp b/actuarial_table.cpp
index 17157cc..eeb29bd 100644
--- a/actuarial_table.cpp
+++ b/actuarial_table.cpp
@@ -34,8 +34,8 @@
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/path.hpp>
-#include <algorithm> // std::max(), std::min()
-#include <cctype> // std::toupper()
+#include <algorithm> // max(), min()
+#include <cctype> // toupper()
#include <climits> // CHAR_BIT
#include <cstdint>
#include <ios>
diff --git a/actuarial_table_test.cpp b/actuarial_table_test.cpp
index 78d498e..e8f4ae5 100644
--- a/actuarial_table_test.cpp
+++ b/actuarial_table_test.cpp
@@ -28,7 +28,7 @@
#include "test_tools.hpp"
#include "timer.hpp"
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <fstream>
namespace
diff --git a/alert.cpp b/alert.cpp
index b7548c1..8e5783c 100644
--- a/alert.cpp
+++ b/alert.cpp
@@ -30,7 +30,7 @@
#endif // defined LMI_MSW
#include <ios>
-#include <sstream> // std::stringbuf
+#include <sstream> // stringbuf
#include <stdexcept>
#include <type_traits>
diff --git a/alert_cgi.cpp b/alert_cgi.cpp
index b829aea..2d5ceb1 100644
--- a/alert_cgi.cpp
+++ b/alert_cgi.cpp
@@ -23,7 +23,7 @@
#include "alert.hpp"
-#include <cstdio> // std::fputs()
+#include <cstdio> // fputs()
#include <stdexcept>
namespace
diff --git a/alert_cli.cpp b/alert_cli.cpp
index f671a30..1724ebf 100644
--- a/alert_cli.cpp
+++ b/alert_cli.cpp
@@ -23,7 +23,7 @@
#include "alert.hpp"
-#include <cstdio> // std::fputs(), std::getchar()
+#include <cstdio> // fputs(), getchar()
#include <iostream>
#include <stdexcept>
diff --git a/alert_test.cpp b/alert_test.cpp
index 171a5f5..45de168 100644
--- a/alert_test.cpp
+++ b/alert_test.cpp
@@ -26,7 +26,7 @@
#include "test_tools.hpp"
#include <algorithm>
-#include <iterator> // std::ostream_iterator
+#include <iterator> // ostream_iterator
#include <stdexcept>
#include <vector>
diff --git a/any_member.hpp b/any_member.hpp
index 3c41858..c8200cc 100644
--- a/any_member.hpp
+++ b/any_member.hpp
@@ -66,7 +66,7 @@
#include "rtti_lmi.hpp"
#include "value_cast.hpp"
-#include <algorithm> // std::lower_bound(), std::swap()
+#include <algorithm> // lower_bound(), swap()
#include <map>
#include <sstream>
#include <stdexcept>
diff --git a/any_member_test.cpp b/any_member_test.cpp
index 66b0b49..b233caa 100644
--- a/any_member_test.cpp
+++ b/any_member_test.cpp
@@ -25,7 +25,7 @@
#include "test_tools.hpp"
-#include <cmath> // std::exp()
+#include <cmath> // exp()
#include <functional>
#include <iostream>
#include <istream>
diff --git a/authenticity.cpp b/authenticity.cpp
index 1164dee..d31309e 100644
--- a/authenticity.cpp
+++ b/authenticity.cpp
@@ -36,9 +36,9 @@
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/operations.hpp>
-#include <cstdio> // std::fclose(), std::fopen()
-#include <cstdlib> // std::exit(), EXIT_FAILURE
-#include <cstring> // std::memcpy()
+#include <cstdio> // fclose(), fopen()
+#include <cstdlib> // exit(), EXIT_FAILURE
+#include <cstring> // memcpy()
#include <iomanip>
#include <sstream>
diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index 8e12a15..3909e1d 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -34,9 +34,9 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <cstdio>
-#include <cstring> // std::memcpy()
+#include <cstring> // memcpy()
#include <fstream>
#include <string>
#include <vector>
diff --git a/basic_values.hpp b/basic_values.hpp
index 22055bd..6921e95 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -32,9 +32,9 @@
#include "so_attributes.hpp"
#include "yare_input.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
-#include <utility> // std::pair
+#include <utility> // pair
#include <vector>
// Let's do this through once for UL, then think about extending it to other
diff --git a/basicvalues.cpp b/basicvalues.cpp
index 2519ff5..9ca8a83 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -36,8 +36,8 @@
#include "premium_tax.hpp"
#include "surrchg_rates.hpp"
-#include <algorithm> // std::max()
-#include <cmath> // std::pow()
+#include <algorithm> // max()
+#include <cmath> // pow()
// IHS !! Instead of these hardcoded paths, lmi uses a configuration file.
//
diff --git a/bcc_ar.cpp b/bcc_ar.cpp
index b8f9fed..6d24be5 100644
--- a/bcc_ar.cpp
+++ b/bcc_ar.cpp
@@ -40,7 +40,7 @@
#include "license.hpp"
#include "system_command.hpp"
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <iostream>
#include <string>
diff --git a/bcc_ld.cpp b/bcc_ld.cpp
index 05180c8..c0ce62a 100644
--- a/bcc_ld.cpp
+++ b/bcc_ld.cpp
@@ -45,7 +45,7 @@
#include <fstream>
#include <ios>
#include <iostream>
-#include <iterator> // std::ostream_iterator
+#include <iterator> // ostream_iterator
#include <ostream>
#include <sstream>
#include <string>
diff --git a/bourn_cast.hpp b/bourn_cast.hpp
index d3162ac..97bce09 100644
--- a/bourn_cast.hpp
+++ b/bourn_cast.hpp
@@ -30,7 +30,7 @@
#include <limits>
#include <sstream>
#include <stdexcept>
-#include <type_traits> // std::integral_constant
+#include <type_traits> // integral_constant
#if defined __GNUC__
# pragma GCC diagnostic push
diff --git a/cache_file_reads.hpp b/cache_file_reads.hpp
index eeb7e43..3d1ec08 100644
--- a/cache_file_reads.hpp
+++ b/cache_file_reads.hpp
@@ -28,11 +28,11 @@
#include <boost/filesystem/operations.hpp>
-#include <ctime> // std::time_t
+#include <ctime> // time_t
#include <map>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
-#include <utility> // std::make_pair()
+#include <utility> // make_pair()
namespace detail
{
diff --git a/calendar_date.cpp b/calendar_date.cpp
index 3fb0283..9fe5c42 100644
--- a/calendar_date.cpp
+++ b/calendar_date.cpp
@@ -28,16 +28,16 @@
#include "bourn_cast.hpp"
#include "zero.hpp"
-#include <algorithm> // std::max(), std::min()
+#include <algorithm> // max(), min()
#include <ctime>
#include <iomanip>
#include <ios>
#include <istream>
-#include <iterator> // std::ostreambuf_iterator
+#include <iterator> // ostreambuf_iterator
#include <locale>
#include <ostream>
#include <sstream>
-#include <stdexcept> // std::runtime_error
+#include <stdexcept> // runtime_error
namespace
{
diff --git a/ce_product_name.cpp b/ce_product_name.cpp
index b0e2a10..b471d6c 100644
--- a/ce_product_name.cpp
+++ b/ce_product_name.cpp
@@ -33,7 +33,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <algorithm> // std::find()
+#include <algorithm> // find()
namespace
{
diff --git a/ce_product_name.hpp b/ce_product_name.hpp
index 38b6e44..312ca38 100644
--- a/ce_product_name.hpp
+++ b/ce_product_name.hpp
@@ -26,7 +26,7 @@
#include "mc_enum.hpp"
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <string>
#include <vector>
diff --git a/ce_skin_name.cpp b/ce_skin_name.cpp
index 9a4d8ab..2cb694a 100644
--- a/ce_skin_name.cpp
+++ b/ce_skin_name.cpp
@@ -34,7 +34,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <algorithm> // std::find()
+#include <algorithm> // find()
namespace
{
diff --git a/ce_skin_name.hpp b/ce_skin_name.hpp
index 2f64306..c3c17ce 100644
--- a/ce_skin_name.hpp
+++ b/ce_skin_name.hpp
@@ -26,7 +26,7 @@
#include "mc_enum.hpp"
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <string>
#include <vector>
diff --git a/census_view.cpp b/census_view.cpp
index ea224ae..afb7a8d 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -59,9 +59,9 @@
#include <algorithm>
#include <cctype>
-#include <cstddef> // std::size_t
-#include <istream> // std::ws
-#include <iterator> // std::insert_iterator
+#include <cstddef> // size_t
+#include <istream> // ws
+#include <iterator> // insert_iterator
#include <sstream>
namespace
diff --git a/census_view.hpp b/census_view.hpp
index ef632f8..cbaf644 100644
--- a/census_view.hpp
+++ b/census_view.hpp
@@ -33,7 +33,7 @@
#include <wx/object.h> // wxObjectDataPtr
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
#include <vector>
diff --git a/commutation_functions.cpp b/commutation_functions.cpp
index e1f2abf..12142fc 100644
--- a/commutation_functions.cpp
+++ b/commutation_functions.cpp
@@ -26,10 +26,10 @@
#include "assert_lmi.hpp"
#include "et_vector.hpp" // [VECTORIZE]
-#include <algorithm> // std::rotate_copy() [VECTORIZE]
-#include <cmath> // std::pow()
-#include <functional> // std::multiplies() [VECTORIZE]
-#include <numeric> // std::partial_sum()
+#include <algorithm> // rotate_copy() [VECTORIZE]
+#include <cmath> // pow()
+#include <functional> // multiplies [VECTORIZE]
+#include <numeric> // partial_sum()
/// Interest- and mortality-rate vectors --> commutation functions.
///
diff --git a/commutation_functions_test.cpp b/commutation_functions_test.cpp
index 4320a43..bbd48f1 100644
--- a/commutation_functions_test.cpp
+++ b/commutation_functions_test.cpp
@@ -30,11 +30,11 @@
#include "timer.hpp"
#include <algorithm>
-#include <cmath> // std::fabs()
-#include <functional> // std::bind()
-#include <iomanip> // std::setw() etc.
-#include <ios> // std::ios_base::fixed()
-#include <numeric> // std::partial_sum()
+#include <cmath> // fabs()
+#include <functional> // bind()
+#include <iomanip> // setw() etc.
+#include <ios> // ios_base::fixed()
+#include <numeric> // partial_sum()
#include <vector>
namespace
diff --git a/configurable_settings.cpp b/configurable_settings.cpp
index 025b023..c0666f2 100644
--- a/configurable_settings.cpp
+++ b/configurable_settings.cpp
@@ -39,7 +39,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <iterator> // std::istream_iterator
+#include <iterator> // istream_iterator
#include <sstream>
#include <stdexcept>
diff --git a/contains.hpp b/contains.hpp
index 3b8e779..51854bf 100644
--- a/contains.hpp
+++ b/contains.hpp
@@ -24,8 +24,8 @@
#include "config.hpp"
-#include <algorithm> // std::find()
-#include <type_traits> // std::enable_if
+#include <algorithm> // find()
+#include <type_traits> // enable_if
/// Determine whether a class has a find() member.
///
diff --git a/contains_test.cpp b/contains_test.cpp
index 94d9741..bacb71e 100644
--- a/contains_test.cpp
+++ b/contains_test.cpp
@@ -31,7 +31,7 @@
#include <map>
#include <set>
#include <string>
-#include <utility> // std::pair
+#include <utility> // pair
#include <vector>
struct HasFind {void find();};
diff --git a/cpp_main.cpp b/cpp_main.cpp
index 9b2896c..4bf05b3 100644
--- a/cpp_main.cpp
+++ b/cpp_main.cpp
@@ -62,7 +62,7 @@
#include "getopt.hpp"
#include "license.hpp"
-#include <cstdlib> // std::free()
+#include <cstdlib> // free()
#include <iostream>
#if defined LMI_MSW
diff --git a/crc32.hpp b/crc32.hpp
index 8d59fae..e409395 100644
--- a/crc32.hpp
+++ b/crc32.hpp
@@ -26,7 +26,7 @@
#include "so_attributes.hpp"
-#include <cstring> // std::strlen()
+#include <cstring> // strlen()
#include <string>
#include <vector>
diff --git a/currency_test.cpp b/currency_test.cpp
index 97a4f17..29aca90 100644
--- a/currency_test.cpp
+++ b/currency_test.cpp
@@ -26,7 +26,7 @@
#include "test_tools.hpp"
#include "timer.hpp"
-#include <cmath> // std::floor()
+#include <cmath> // floor()
#include <limits>
#include <sstream>
#include <stdexcept>
diff --git a/database.cpp b/database.cpp
index dcdcd48..760ac1b 100644
--- a/database.cpp
+++ b/database.cpp
@@ -32,7 +32,7 @@
#include "product_data.hpp"
#include "yare_input.hpp"
-#include <algorithm> // std::min()
+#include <algorithm> // min()
/// Construct from essential input (product and axes).
diff --git a/database.hpp b/database.hpp
index 4f61c6c..05c82af 100644
--- a/database.hpp
+++ b/database.hpp
@@ -29,7 +29,7 @@
#include "mc_enum_type_enums.hpp"
#include "so_attributes.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
#include <vector>
diff --git a/database_view.hpp b/database_view.hpp
index 7cfc17f..ceee69a 100644
--- a/database_view.hpp
+++ b/database_view.hpp
@@ -26,7 +26,7 @@
#include "product_editor.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
class DatabaseDocument;
class DatabaseTableAdapter;
diff --git a/database_view_editor.cpp b/database_view_editor.cpp
index b60aefd..8bf0784 100644
--- a/database_view_editor.cpp
+++ b/database_view_editor.cpp
@@ -32,7 +32,7 @@
#include <wx/utils.h> // wxBusyCursor
#include <exception>
-#include <numeric> // std::accumulate()
+#include <numeric> // accumulate()
/// Database Axis definitions
/// -------------------------
diff --git a/database_view_editor.hpp b/database_view_editor.hpp
index 6cde21e..1f2f282 100644
--- a/database_view_editor.hpp
+++ b/database_view_editor.hpp
@@ -38,7 +38,7 @@
#include "dbvalue.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
/// Database dictionary adapter for database_entity class
diff --git a/dbvalue.cpp b/dbvalue.cpp
index d7e7b76..4d21126 100644
--- a/dbvalue.cpp
+++ b/dbvalue.cpp
@@ -35,9 +35,9 @@
#include "xml_serialize.hpp"
#include <algorithm>
-#include <functional> // std::multiplies()
-#include <limits> // std::numeric_limits
-#include <numeric> // std::accumulate()
+#include <functional> // multiplies
+#include <limits> // numeric_limits
+#include <numeric> // accumulate()
#include <ostream>
namespace
diff --git a/death_benefits.cpp b/death_benefits.cpp
index 5e2adb7..8f8b328 100644
--- a/death_benefits.cpp
+++ b/death_benefits.cpp
@@ -26,7 +26,7 @@
#include "assert_lmi.hpp"
#include "yare_input.hpp"
-#include <algorithm> // std::min()
+#include <algorithm> // min()
//============================================================================
death_benefits::death_benefits(int length, yare_input const& yi)
diff --git a/deserialize_cast.hpp b/deserialize_cast.hpp
index 35ee139..b97fc38 100644
--- a/deserialize_cast.hpp
+++ b/deserialize_cast.hpp
@@ -24,7 +24,7 @@
#include "config.hpp"
-#include <cstring> // std::memcpy()
+#include <cstring> // memcpy()
/// Reinterpret char* contents as a value of the given type.
///
diff --git a/docmanager_ex.hpp b/docmanager_ex.hpp
index ab50b43..9bf7905 100644
--- a/docmanager_ex.hpp
+++ b/docmanager_ex.hpp
@@ -26,7 +26,7 @@
#include <wx/docview.h>
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData;
diff --git a/emit_ledger.hpp b/emit_ledger.hpp
index 08c2365..1625f19 100644
--- a/emit_ledger.hpp
+++ b/emit_ledger.hpp
@@ -29,7 +29,7 @@
#include <boost/filesystem/path.hpp>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
class group_quote_pdf_generator;
class Ledger;
diff --git a/expression_template_0_test.cpp b/expression_template_0_test.cpp
index c6cb485..c197f09 100644
--- a/expression_template_0_test.cpp
+++ b/expression_template_0_test.cpp
@@ -47,8 +47,8 @@
#endif // defined USE_UBLAS
#include <algorithm>
-#include <functional> // std::bind() et al.
-#include <iterator> // std::back_inserter()
+#include <functional> // bind() et al.
+#include <iterator> // back_inserter()
#include <string>
#include <valarray>
#include <vector>
diff --git a/facets.cpp b/facets.cpp
index 856aa73..768a868 100644
--- a/facets.cpp
+++ b/facets.cpp
@@ -23,7 +23,7 @@
#include "facets.hpp"
-#include <algorithm> // std::copy()
+#include <algorithm> // copy()
// Class C_is_not_whitespace_ctype is intended for extracting
// std::strings from a stream without stopping at char <C>. It is a
diff --git a/fenv_lmi_test.cpp b/fenv_lmi_test.cpp
index 4a26e6a..8f4b19d 100644
--- a/fenv_lmi_test.cpp
+++ b/fenv_lmi_test.cpp
@@ -42,7 +42,7 @@
#include <bitset>
#include <cfenv>
#include <climits> // CHAR_BIT
-#include <math.h> // std::rint()
+#include <math.h> // rint()
#include <stdexcept>
std::bitset<CHAR_BIT * sizeof(unsigned long int)> bits(unsigned long int i)
diff --git a/file_command_wx.cpp b/file_command_wx.cpp
index 2290341..2cb3e06 100644
--- a/file_command_wx.cpp
+++ b/file_command_wx.cpp
@@ -32,7 +32,7 @@
#include <wx/mimetype.h>
#include <wx/utils.h> // wxExecute()
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
LMI_FORCE_LINKING_IN_SITU(file_command_wx)
diff --git a/financial.cpp b/financial.cpp
index 3d14d46..0baa187 100644
--- a/financial.cpp
+++ b/financial.cpp
@@ -25,9 +25,9 @@
#include "calendar_date.hpp"
-#include <algorithm> // std::generate(), std::min()
-#include <cmath> // std::pow()
-#include <numeric> // std::inner_product()
+#include <algorithm> // generate(), min()
+#include <cmath> // pow()
+#include <numeric> // inner_product()
#include <vector>
/// Possibly off-anniversary premium to be shown on list bill.
diff --git a/financial_test.cpp b/financial_test.cpp
index 5d72bc6..6a7c634 100644
--- a/financial_test.cpp
+++ b/financial_test.cpp
@@ -26,8 +26,8 @@
#include "test_tools.hpp"
#include "timer.hpp"
-#include <cmath> // std::fabs()
-#include <functional> // std::bind()
+#include <cmath> // fabs()
+#include <functional> // bind()
#include <iomanip> // Formatting of optional detail.
#include <iostream>
#include <vector>
diff --git a/getopt.cpp b/getopt.cpp
index c5b4370..0bf2277 100644
--- a/getopt.cpp
+++ b/getopt.cpp
@@ -89,7 +89,7 @@
#include "getopt.hpp"
// GWC added this.
-#include <algorithm> // std::max()
+#include <algorithm> // max()
// GWC added this for prototype of std::isalpha().
#include <cctype>
// GWC added this.
@@ -97,7 +97,7 @@
// GWC added this.
#include <cstdio>
// GWC added this.
-#include <cstdlib> // std::malloc
+#include <cstdlib> // malloc()
// GWC added this.
#include <cstring>
// GWC added this.
diff --git a/gpt_commutation_functions.cpp b/gpt_commutation_functions.cpp
index 8a87501..a21dc2b 100644
--- a/gpt_commutation_functions.cpp
+++ b/gpt_commutation_functions.cpp
@@ -28,8 +28,8 @@
#include "et_vector.hpp"
#include "miscellany.hpp" // minmax
-#include <algorithm> // std::min_element()
-#include <numeric> // std::partial_sum()
+#include <algorithm> // min_element()
+#include <numeric> // partial_sum()
#include <stdexcept>
namespace
diff --git a/gpt_input.cpp b/gpt_input.cpp
index c2b5972..e435535 100644
--- a/gpt_input.cpp
+++ b/gpt_input.cpp
@@ -35,11 +35,11 @@
#include "map_lookup.hpp"
#include "miscellany.hpp" // each_equal(), lmi_array_size()
-#include <algorithm> // std::max()
+#include <algorithm> // max()
#include <exception>
#include <limits>
#include <sstream>
-#include <utility> // std::pair
+#include <utility> // pair
template class xml_serializable<gpt_input>;
diff --git a/gpt_input.hpp b/gpt_input.hpp
index 8d0e22f..fe86599 100644
--- a/gpt_input.hpp
+++ b/gpt_input.hpp
@@ -42,7 +42,7 @@ class product_database;
#include <boost/operators.hpp>
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
#include <string>
#include <vector>
diff --git a/gpt_server.cpp b/gpt_server.cpp
index 21da07e..925f020 100644
--- a/gpt_server.cpp
+++ b/gpt_server.cpp
@@ -54,7 +54,7 @@
#include <boost/filesystem/convenience.hpp> // extension(), change_extension()
#include <boost/filesystem/fstream.hpp>
-#include <algorithm> // std::min()
+#include <algorithm> // min()
#include <iostream>
#include <limits>
#include <string>
diff --git a/gpt_test.cpp b/gpt_test.cpp
index 44e7014..5c223e2 100644
--- a/gpt_test.cpp
+++ b/gpt_test.cpp
@@ -30,7 +30,7 @@
#include "test_tools.hpp"
#include "timer.hpp"
-#include <numeric> // std::iota()
+#include <numeric> // iota()
#include <vector>
namespace
diff --git a/group_quote_pdf_gen.hpp b/group_quote_pdf_gen.hpp
index 8211bbd..e897aef 100644
--- a/group_quote_pdf_gen.hpp
+++ b/group_quote_pdf_gen.hpp
@@ -26,7 +26,7 @@
#include "so_attributes.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
class Ledger;
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index 68405cb..4043a99 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -49,11 +49,11 @@
#include <wx/image.h>
#include <wx/pdfdc.h>
-#include <cstring> // std::strstr()
+#include <cstring> // strstr()
#include <limits>
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
#include <stdexcept>
-#include <utility> // std::pair
+#include <utility> // pair
#include <vector>
LMI_FORCE_LINKING_IN_SITU(group_quote_pdf_generator_wx)
diff --git a/group_values.cpp b/group_values.cpp
index b20229e..c8ef1fd 100644
--- a/group_values.cpp
+++ b/group_values.cpp
@@ -40,8 +40,8 @@
#include "timer.hpp"
#include "value_cast.hpp"
-#include <algorithm> // std::max()
-#include <iterator> // std::back_inserter()
+#include <algorithm> // max()
+#include <iterator> // back_inserter()
#include <string>
namespace
diff --git a/group_values.hpp b/group_values.hpp
index 7ac6abe..be7f55f 100644
--- a/group_values.hpp
+++ b/group_values.hpp
@@ -29,7 +29,7 @@
#include <boost/filesystem/path.hpp>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <vector>
class Input;
diff --git a/handle_exceptions.hpp b/handle_exceptions.hpp
index 16838c3..c98f7aa 100644
--- a/handle_exceptions.hpp
+++ b/handle_exceptions.hpp
@@ -26,7 +26,7 @@
#include "alert.hpp" // hobsons_choice_exception,
safely_show_message()
-#include <cstdlib> // std::exit()
+#include <cstdlib> // exit()
#include <exception>
#include <stdexcept>
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 1e19c08..57cd15b 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -48,8 +48,8 @@
#include <algorithm>
#include <cmath>
-#include <functional> // std::bind() et al.
-#include <iterator> // std::back_inserter()
+#include <functional> // bind() et al.
+#include <iterator> // back_inserter()
#include <limits>
#include <numeric>
#include <string>
diff --git a/ihs_avdebug.cpp b/ihs_avdebug.cpp
index 8efc660..dc68c82 100644
--- a/ihs_avdebug.cpp
+++ b/ihs_avdebug.cpp
@@ -34,7 +34,7 @@
#include "value_cast.hpp"
#include <algorithm>
-#include <iterator> // std::ostream_iterator
+#include <iterator> // ostream_iterator
#include <string>
#include <vector>
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 1c5e0ad..fe08de2 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -44,8 +44,8 @@
#include "stratified_algorithms.hpp"
#include "stratified_charges.hpp"
-#include <algorithm> // std::min(), std::max()
-#include <cmath> // std::pow()
+#include <algorithm> // min(), max()
+#include <cmath> // pow()
#include <limits>
// Each month, process all transactions in order.
diff --git a/ihs_avsolve.cpp b/ihs_avsolve.cpp
index aeaad5e..98f4e47 100644
--- a/ihs_avsolve.cpp
+++ b/ihs_avsolve.cpp
@@ -41,9 +41,9 @@
#include "outlay.hpp"
#include "zero.hpp"
-#include <algorithm> // std::min(), std::max()
+#include <algorithm> // min(), max()
#include <functional>
-#include <numeric> // std::accumulate()
+#include <numeric> // accumulate()
namespace
{
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index e99d5b3..5412f61 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -53,8 +53,8 @@
#include "value_cast.hpp"
#include <algorithm>
-#include <cmath> // std::pow()
-#include <functional> // std::multiplies
+#include <cmath> // pow()
+#include <functional> // multiplies
#include <limits>
#include <numeric>
#include <stdexcept>
diff --git a/ihs_irc7702.hpp b/ihs_irc7702.hpp
index 270de99..838c1e2 100644
--- a/ihs_irc7702.hpp
+++ b/ihs_irc7702.hpp
@@ -27,7 +27,7 @@
#include "mc_enum_type_enums.hpp"
#include "round_to.hpp"
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
#include <vector>
class ULCommFns;
diff --git a/ihs_irc7702a.cpp b/ihs_irc7702a.cpp
index 76a97f0..d89e4e5 100644
--- a/ihs_irc7702a.cpp
+++ b/ihs_irc7702a.cpp
@@ -38,7 +38,7 @@
#include <algorithm>
#include <cmath>
#include <limits>
-#include <numeric> // std::accumulate()
+#include <numeric> // accumulate()
#include <stdexcept>
namespace
diff --git a/ihs_mortal.cpp b/ihs_mortal.cpp
index 0b5c3e1..afc3cb9 100644
--- a/ihs_mortal.cpp
+++ b/ihs_mortal.cpp
@@ -29,7 +29,7 @@
#include "et_vector.hpp"
#include "math_functors.hpp" // assign_midpoint()
-#include <algorithm> // std::min()
+#include <algorithm> // min()
//============================================================================
MortalityRates::MortalityRates(BasicValues const& basic_values)
diff --git a/illustration_view.hpp b/illustration_view.hpp
index ab8b7f3..3d63b94 100644
--- a/illustration_view.hpp
+++ b/illustration_view.hpp
@@ -39,7 +39,7 @@
#include <wx/event.h>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
class IllustrationDocument;
class Input;
diff --git a/illustrator.hpp b/illustrator.hpp
index fa6707d..3bcba87 100644
--- a/illustrator.hpp
+++ b/illustrator.hpp
@@ -30,7 +30,7 @@
#include <boost/filesystem/path.hpp>
#include <functional>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <vector>
class Input;
diff --git a/input.hpp b/input.hpp
index 6c99e2e..a3c6fde 100644
--- a/input.hpp
+++ b/input.hpp
@@ -43,7 +43,7 @@ class product_database;
#include <boost/operators.hpp>
#include <map>
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
#include <string>
#include <vector>
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index e812cd2..44b6476 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -33,8 +33,8 @@
#include "input_sequence.hpp"
#include "mc_enum_types_aux.hpp" // is_subject_to_ill_reg(),
is_three_rate_nasd()
-#include <algorithm> // std::min(), std::max()
-#include <utility> // std::pair
+#include <algorithm> // min(), max()
+#include <utility> // pair
// Harmonization is physically separated for no better reason than to
// facilitate its development at a time when it frequently changes.
diff --git a/input_realization.cpp b/input_realization.cpp
index 27ef66a..2c90b50 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -37,9 +37,9 @@
#include <algorithm>
#include <exception>
-#include <functional> // std::bind()
+#include <functional> // bind()
#include <sstream>
-#include <utility> // std::pair
+#include <utility> // pair
//============================================================================
// Realize sequence strings with only numeric values.
diff --git a/input_sequence.cpp b/input_sequence.cpp
index c5d3efc..54f438e 100644
--- a/input_sequence.cpp
+++ b/input_sequence.cpp
@@ -31,7 +31,7 @@
#include "input_sequence_parser.hpp"
#include "value_cast.hpp"
-#include <algorithm> // std::fill()
+#include <algorithm> // fill()
#include <sstream>
#include <stdexcept>
#include <type_traits>
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index 8ceb511..a6ee31e 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -49,9 +49,9 @@
#include <wx/valtext.h>
#include <wx/wupdlock.h>
-#include <algorithm> // std::copy()
+#include <algorithm> // copy()
#include <exception>
-#include <iterator> // std::back_inserter()
+#include <iterator> // back_inserter()
#include <map>
#include <vector>
diff --git a/input_sequence_parser.cpp b/input_sequence_parser.cpp
index 0a5fe8d..86cfc54 100644
--- a/input_sequence_parser.cpp
+++ b/input_sequence_parser.cpp
@@ -27,9 +27,9 @@
#include "contains.hpp"
#include "miscellany.hpp" // is_ok_for_cctype(), rtrim()
-#include <algorithm> // std::copy()
-#include <cctype> // std::isalnum, std::isspace()
-#include <iterator> // std::ostream_iterator
+#include <algorithm> // copy()
+#include <cctype> // isalnum(), isspace()
+#include <iterator> // ostream_iterator
SequenceParser::SequenceParser
(std::string const& input_expression
diff --git a/input_sequence_test.cpp b/input_sequence_test.cpp
index ed33f2f..8313743 100644
--- a/input_sequence_test.cpp
+++ b/input_sequence_test.cpp
@@ -26,7 +26,7 @@
#include "test_tools.hpp"
#include <algorithm>
-#include <iterator> // std::ostream_iterator
+#include <iterator> // ostream_iterator
class input_sequence_test
{
diff --git a/input_test.cpp b/input_test.cpp
index 612b0ab..0932804 100644
--- a/input_test.cpp
+++ b/input_test.cpp
@@ -46,9 +46,9 @@
#if defined BOOST_MSVC || defined __BORLANDC__
# include <cfloat> // floating-point hardware control
#endif // defined BOOST_MSVC || defined __BORLANDC__
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <fstream>
-#include <functional> // std::bind()
+#include <functional> // bind()
#include <ios>
#include <string>
diff --git a/input_xml_io.cpp b/input_xml_io.cpp
index 8066214..8a88e67 100644
--- a/input_xml_io.cpp
+++ b/input_xml_io.cpp
@@ -33,9 +33,9 @@
#include "miscellany.hpp" // lmi_array_size()
#include "oecumenic_enumerations.hpp"
-#include <algorithm> // std::min()
+#include <algorithm> // min()
#include <stdexcept>
-#include <utility> // std::pair
+#include <utility> // pair
template class xml_serializable<Input>;
diff --git a/interest_rates.cpp b/interest_rates.cpp
index fbaff0b..918b47a 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -32,9 +32,9 @@
#include "miscellany.hpp" // each_equal()
#include "yare_input.hpp"
-#include <algorithm> // std::max(), std::copy()
+#include <algorithm> // max(), copy()
#include <functional>
-#include <iterator> // std::back_inserter()
+#include <iterator> // back_inserter()
// TODO ?? Future enhancements:
//
diff --git a/istream_to_string_test.cpp b/istream_to_string_test.cpp
index efe61bd..ddc16a5 100644
--- a/istream_to_string_test.cpp
+++ b/istream_to_string_test.cpp
@@ -29,7 +29,7 @@
#include <cstdio>
#include <fstream>
-#include <iterator> // std::istreambuf_iterator
+#include <iterator> // istreambuf_iterator
template<typename Char_t, typename Traits, typename Allocator>
void istream_to_string_1
diff --git a/ledger.hpp b/ledger.hpp
index f18e5e3..e424c65 100644
--- a/ledger.hpp
+++ b/ledger.hpp
@@ -29,7 +29,7 @@
#include "xml_lmi.hpp"
#include <iosfwd>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
#include <vector>
diff --git a/ledger_base.cpp b/ledger_base.cpp
index 2fadc4e..7836748 100644
--- a/ledger_base.cpp
+++ b/ledger_base.cpp
@@ -29,9 +29,9 @@
#include "miscellany.hpp" // minmax
#include "value_cast.hpp"
-#include <algorithm> // std::max(), std::min(),
std::transform()
-#include <cmath> // std::floor(), std::log10(),
std::pow()
-#include <functional> // std::multiplies
+#include <algorithm> // max(), min(), transform()
+#include <cmath> // floor(), log10(), pow()
+#include <functional> // multiplies
//============================================================================
LedgerBase::LedgerBase(int a_Length)
diff --git a/ledger_base.hpp b/ledger_base.hpp
index 18a5295..a6cba41 100644
--- a/ledger_base.hpp
+++ b/ledger_base.hpp
@@ -26,10 +26,10 @@
#include "so_attributes.hpp"
-#include <algorithm> // std::copy()
+#include <algorithm> // copy()
#include <cfloat> // DECIMAL_DIG
-#include <iomanip> // std::setprecision()
-#include <iterator> // std::ostream_iterator
+#include <iomanip> // setprecision()
+#include <iterator> // ostream_iterator
#include <map>
#include <ostream>
#include <string>
diff --git a/ledger_xml_io.cpp b/ledger_xml_io.cpp
index 70826f2..38e1efd 100644
--- a/ledger_xml_io.cpp
+++ b/ledger_xml_io.cpp
@@ -48,11 +48,11 @@
#include <xsltwrapp/xsltwrapp.h>
-#include <algorithm> // std::transform()
-#include <functional> // std::minus
+#include <algorithm> // transform()
+#include <functional> // minus
#include <map>
#include <ostream>
-#include <utility> // std::pair
+#include <utility> // pair
namespace
{
diff --git a/ledgervalues.hpp b/ledgervalues.hpp
index 09e01ea..d981aa9 100644
--- a/ledgervalues.hpp
+++ b/ledgervalues.hpp
@@ -26,7 +26,7 @@
#include "so_attributes.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
class Input;
diff --git a/loads_test.cpp b/loads_test.cpp
index d2ca9bc..1f3c0af 100644
--- a/loads_test.cpp
+++ b/loads_test.cpp
@@ -30,8 +30,8 @@
#include "test_tools.hpp"
#include "timer.hpp"
-#include <cstddef> // std::size_t
-#include <functional> // std::bind()
+#include <cstddef> // size_t
+#include <functional> // bind()
namespace
{
diff --git a/main_cgi.cpp b/main_cgi.cpp
index 722557c..f266ec1 100644
--- a/main_cgi.cpp
+++ b/main_cgi.cpp
@@ -61,7 +61,7 @@
#include <fstream>
#include <ios>
#include <iostream>
-#include <istream> // std::ws
+#include <istream> // ws
#include <ostream>
#include <sstream>
#include <string>
diff --git a/main_cli.cpp b/main_cli.cpp
index 79ef359..f690a01 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -51,8 +51,8 @@
#include <algorithm>
#include <cmath>
-#include <cstdio> // std::printf()
-#include <functional> // std::bind()
+#include <cstdio> // printf()
+#include <functional> // bind()
#include <ios>
#include <iostream>
#include <ostream>
diff --git a/main_common.cpp b/main_common.cpp
index 3f8a9d5..58c897e 100644
--- a/main_common.cpp
+++ b/main_common.cpp
@@ -28,7 +28,7 @@
#include "sigfpe.hpp"
#include <csignal>
-#include <exception> // std::set_terminate()
+#include <exception> // set_terminate()
#include <stdexcept>
#if defined LMI_MSW
diff --git a/main_wx_test.cpp b/main_wx_test.cpp
index 6fec3b8..6691b4d 100644
--- a/main_wx_test.cpp
+++ b/main_wx_test.cpp
@@ -46,8 +46,8 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <algorithm> // std::sort()
-#include <cstring> // std::strcmp()
+#include <algorithm> // sort()
+#include <cstring> // strcmp()
#include <exception> // uncaught_exception()
#include <iostream>
#include <sstream>
diff --git a/math_functors.hpp b/math_functors.hpp
index 3c9c015..d12a8fc 100644
--- a/math_functors.hpp
+++ b/math_functors.hpp
@@ -27,8 +27,8 @@
#include "assert_lmi.hpp"
#include "et_vector.hpp"
-#include <algorithm> // std::max(), std::min()
-#include <cmath> // std::expm1(), std::log1p()
+#include <algorithm> // max(), min()
+#include <cmath> // expm1(), log1p()
#include <functional>
#include <stdexcept>
#include <type_traits>
diff --git a/math_functors_test.cpp b/math_functors_test.cpp
index 82efe82..a9efb23 100644
--- a/math_functors_test.cpp
+++ b/math_functors_test.cpp
@@ -29,8 +29,8 @@
#include "test_tools.hpp"
#include "timer.hpp"
-#include <algorithm> // std::min()
-#include <cmath> // std::isnan(), std::pow()
+#include <algorithm> // min()
+#include <cmath> // isnan(), pow()
#include <functional>
#include <iomanip>
#include <limits>
diff --git a/mc_enum.cpp b/mc_enum.cpp
index 0aacf71..08ed9f8 100644
--- a/mc_enum.cpp
+++ b/mc_enum.cpp
@@ -23,7 +23,7 @@
#include "mc_enum.hpp"
-#include <algorithm> // std::find()
+#include <algorithm> // find()
mc_enum_base::mc_enum_base(int cardinality_of_the_enumeration)
:allowed_(cardinality_of_the_enumeration, true)
diff --git a/mc_enum.hpp b/mc_enum.hpp
index f9a35fd..9870c85 100644
--- a/mc_enum.hpp
+++ b/mc_enum.hpp
@@ -28,7 +28,7 @@
#include <boost/operators.hpp>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <deque>
#include <string>
#include <type_traits>
diff --git a/mc_enum.tpp b/mc_enum.tpp
index 9a74935..addc70a 100644
--- a/mc_enum.tpp
+++ b/mc_enum.tpp
@@ -26,7 +26,7 @@
#include "facets.hpp"
#include "rtti_lmi.hpp"
-#include <algorithm> // std::find()
+#include <algorithm> // find()
#include <typeinfo>
/// The header that defines class mc_enum is by design unaware of its
diff --git a/mc_enum_metadata.hpp b/mc_enum_metadata.hpp
index 991e2ce..68affe0 100644
--- a/mc_enum_metadata.hpp
+++ b/mc_enum_metadata.hpp
@@ -36,7 +36,7 @@
#include "config.hpp"
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
/// Associate an mc_enum type with its metadata through its enum type.
///
diff --git a/mc_enum_types_aux.cpp b/mc_enum_types_aux.cpp
index 5fca9e1..abbb8ee 100644
--- a/mc_enum_types_aux.cpp
+++ b/mc_enum_types_aux.cpp
@@ -28,7 +28,7 @@
#include "mc_enum.hpp"
#include "mc_enum_types.hpp"
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <stdexcept>
namespace
diff --git a/md5.hpp b/md5.hpp
index 877ffb4..bac2522 100644
--- a/md5.hpp
+++ b/md5.hpp
@@ -47,7 +47,7 @@
// GWC: lmi compatibility header.
#include "config.hpp"
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <cstdio> // GWC added this required header.
/* GWC: Make this header usable with C++. */
diff --git a/mec_input.cpp b/mec_input.cpp
index 8ccee30..7e9e1b5 100644
--- a/mec_input.cpp
+++ b/mec_input.cpp
@@ -35,11 +35,11 @@
#include "map_lookup.hpp"
#include "miscellany.hpp" // each_equal(), lmi_array_size()
-#include <algorithm> // std::max()
+#include <algorithm> // max()
#include <exception>
#include <limits>
#include <sstream>
-#include <utility> // std::pair
+#include <utility> // pair
template class xml_serializable<mec_input>;
diff --git a/mec_input.hpp b/mec_input.hpp
index bed78ac..5ff924c 100644
--- a/mec_input.hpp
+++ b/mec_input.hpp
@@ -42,7 +42,7 @@ class product_database;
#include <boost/operators.hpp>
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
#include <string>
#include <vector>
diff --git a/mec_server.cpp b/mec_server.cpp
index 0e41245..4d9ea86 100644
--- a/mec_server.cpp
+++ b/mec_server.cpp
@@ -53,7 +53,7 @@
#include <boost/filesystem/convenience.hpp> // extension(), change_extension()
#include <boost/filesystem/fstream.hpp>
-#include <algorithm> // std::min()
+#include <algorithm> // min()
#include <iostream>
#include <limits>
#include <string>
diff --git a/miscellany.cpp b/miscellany.cpp
index 473e036..62c801d 100644
--- a/miscellany.cpp
+++ b/miscellany.cpp
@@ -26,11 +26,11 @@
#include "alert.hpp"
#include "assert_lmi.hpp"
-#include <algorithm> // std::equal()
+#include <algorithm> // equal()
#include <ctime>
#include <fstream>
#include <istream>
-#include <iterator> // std::istreambuf_iterator
+#include <iterator> // istreambuf_iterator
namespace
{
diff --git a/miscellany.hpp b/miscellany.hpp
index 8a630c7..04e91ff 100644
--- a/miscellany.hpp
+++ b/miscellany.hpp
@@ -29,10 +29,10 @@
#include <algorithm>
#include <cctype>
#include <climits> // UCHAR_MAX
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <cstdio> // EOF
#include <ios>
-#include <iterator> // std::distance()
+#include <iterator> // distance()
#include <string>
#include <utility>
#include <vector>
diff --git a/miscellany_test.cpp b/miscellany_test.cpp
index ba3c9b6..aac3605 100644
--- a/miscellany_test.cpp
+++ b/miscellany_test.cpp
@@ -25,7 +25,7 @@
#include "test_tools.hpp"
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <fstream>
void test_each_equal()
diff --git a/mortality_rates.cpp b/mortality_rates.cpp
index 6d447bc..1734d1c 100644
--- a/mortality_rates.cpp
+++ b/mortality_rates.cpp
@@ -30,7 +30,7 @@
#include "dbnames.hpp"
#include "math_functors.hpp" // assign_midpoint()
-#include <algorithm> // std::min()
+#include <algorithm> // min()
//============================================================================
MortalityRates::MortalityRates(BasicValues const& basic_values)
diff --git a/msw_workarounds.cpp b/msw_workarounds.cpp
index ac5380c..865b8fa 100644
--- a/msw_workarounds.cpp
+++ b/msw_workarounds.cpp
@@ -32,8 +32,8 @@
#include <windows.h>
-#include <iostream> // std::cout, std::endl
-#include <iterator> // std::istream_iterator
+#include <iostream> // cout, endl
+#include <iterator> // istream_iterator
#include <sstream>
MswDllPreloader::MswDllPreloader()
diff --git a/multidimgrid_any.hpp b/multidimgrid_any.hpp
index 4348cd6..05828ee 100644
--- a/multidimgrid_any.hpp
+++ b/multidimgrid_any.hpp
@@ -96,10 +96,10 @@
#include <wx/choice.h>
#include <wx/grid.h>
-#include <cstddef> // std::size_t
-#include <memory> // std::shared_ptr
+#include <cstddef> // size_t
+#include <memory> // shared_ptr
#include <string>
-#include <utility> // std::pair
+#include <utility> // pair
#include <vector>
class MultiDimAxisAny;
diff --git a/mvc_controller.cpp b/mvc_controller.cpp
index 650a7c1..59b83e2 100644
--- a/mvc_controller.cpp
+++ b/mvc_controller.cpp
@@ -51,8 +51,8 @@
#include <wx/wupdlock.h>
#include <wx/xrc/xmlres.h>
-#include <cstddef> // std::size_t
-#include <cstring> // std::strlen()
+#include <cstddef> // size_t
+#include <cstring> // strlen()
namespace
{
diff --git a/name_value_pairs_test.cpp b/name_value_pairs_test.cpp
index f527d1f..c13bcca 100644
--- a/name_value_pairs_test.cpp
+++ b/name_value_pairs_test.cpp
@@ -29,7 +29,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <fstream>
int test_main(int, char*[])
diff --git a/numeric_io_cast.hpp b/numeric_io_cast.hpp
index f650b63..d968768 100644
--- a/numeric_io_cast.hpp
+++ b/numeric_io_cast.hpp
@@ -27,10 +27,10 @@
#include "numeric_io_traits.hpp"
#include "rtti_lmi.hpp"
-#include <cstring> // std::strcmp()
+#include <cstring> // strcmp()
#include <sstream>
#include <stdexcept>
-#include <stdio.h> // std::snprintf()
+#include <stdio.h> // snprintf()
#include <string>
#include <type_traits>
#include <typeinfo>
diff --git a/numeric_io_test.cpp b/numeric_io_test.cpp
index 413463f..08825d0 100644
--- a/numeric_io_test.cpp
+++ b/numeric_io_test.cpp
@@ -31,7 +31,7 @@
#include <boost/lexical_cast.hpp>
-#include <cmath> // std::exp()
+#include <cmath> // exp()
#include <limits>
#include <sstream>
#include <stdexcept>
diff --git a/numeric_io_traits.hpp b/numeric_io_traits.hpp
index 6d18604..a49b4e0 100644
--- a/numeric_io_traits.hpp
+++ b/numeric_io_traits.hpp
@@ -27,10 +27,10 @@
#include "bourn_cast.hpp"
#include "ieee754.hpp" // is_infinite<>()
-#include <algorithm> // std::max()
-#include <cmath> // std::fabs(), std::log10()
-#include <cstdlib> // std::strto*()
-#include <cstring> // std::strcmp(), std::strlen()
+#include <algorithm> // max()
+#include <cmath> // fabs(), log10()
+#include <cstdlib> // strto*()
+#include <cstring> // strcmp(), strlen()
#include <limits>
#include <stdexcept>
#include <string>
diff --git a/path_utility.cpp b/path_utility.cpp
index 2e0e8e5..1296ab6 100644
--- a/path_utility.cpp
+++ b/path_utility.cpp
@@ -32,7 +32,7 @@
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
-#include <cctype> // std::isalnum()
+#include <cctype> // isalnum()
#include <exception>
#include <iomanip>
#include <sstream>
diff --git a/path_utility_test.cpp b/path_utility_test.cpp
index 85f5892..4852aab 100644
--- a/path_utility_test.cpp
+++ b/path_utility_test.cpp
@@ -32,7 +32,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <fstream>
#include <sstream>
#include <stdexcept>
diff --git a/preferences_model.cpp b/preferences_model.cpp
index 247ea8c..f4b1f15 100644
--- a/preferences_model.cpp
+++ b/preferences_model.cpp
@@ -31,7 +31,7 @@
#include <boost/filesystem/operations.hpp> // fs::system_complete()
#include <boost/filesystem/path.hpp>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <sstream>
#include <vector>
diff --git a/premium_tax.cpp b/premium_tax.cpp
index d705374..82ea283 100644
--- a/premium_tax.cpp
+++ b/premium_tax.cpp
@@ -31,7 +31,7 @@
#include "mc_enum_types_aux.hpp" // mc_str()
#include "stratified_charges.hpp"
-#include <algorithm> // std::max()
+#include <algorithm> // max()
namespace {
/// Determine whether premium tax is retaliatory.
diff --git a/print_matrix.hpp b/print_matrix.hpp
index dcc8927..4775913 100644
--- a/print_matrix.hpp
+++ b/print_matrix.hpp
@@ -28,9 +28,9 @@
#include "value_cast.hpp"
#include <algorithm>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <functional>
-#include <iterator> // std::back_inserter()
+#include <iterator> // back_inserter()
#include <numeric>
#include <ostream>
#include <string>
diff --git a/progress_meter.hpp b/progress_meter.hpp
index 454915e..a062717 100644
--- a/progress_meter.hpp
+++ b/progress_meter.hpp
@@ -193,7 +193,7 @@
#include "so_attributes.hpp"
#include <iosfwd>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
std::ostringstream& LMI_SO progress_meter_unit_test_stream();
diff --git a/progress_meter_wx.cpp b/progress_meter_wx.cpp
index f367c9f..53675ab 100644
--- a/progress_meter_wx.cpp
+++ b/progress_meter_wx.cpp
@@ -29,7 +29,7 @@
#include <wx/progdlg.h>
#include <wx/utils.h> // wxMilliSleep()
-#include <ios> // std::fixed,
std::ios_base::precision()
+#include <ios> // fixed, ios_base::precision()
#include <sstream>
LMI_FORCE_LINKING_IN_SITU(progress_meter_wx)
diff --git a/rate_table.cpp b/rate_table.cpp
index ea38aba..89cef5a 100644
--- a/rate_table.cpp
+++ b/rate_table.cpp
@@ -44,11 +44,11 @@
# pragma clang diagnostic pop
#endif // __clang__
-#include <algorithm> // std::count()
+#include <algorithm> // count()
#include <climits> // ULLONG_MAX
#include <cstdint>
-#include <cstdlib> // std::strtoull()
-#include <cstring> // std::strncmp()
+#include <cstdlib> // strtoull()
+#include <cstring> // strncmp()
#include <iomanip>
#include <ios>
#include <istream>
@@ -58,7 +58,7 @@
#include <ostream>
#include <sstream>
#include <stdexcept>
-#include <utility> // std::make_pair(), std::swap()
+#include <utility> // make_pair(), swap()
using std::uint8_t;
using std::uint16_t;
diff --git a/rate_table.hpp b/rate_table.hpp
index 5ec9ddd..780078a 100644
--- a/rate_table.hpp
+++ b/rate_table.hpp
@@ -26,9 +26,9 @@
#include <boost/filesystem/path.hpp>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <iosfwd>
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
#include <vector>
diff --git a/rate_table_test.cpp b/rate_table_test.cpp
index a965ff5..732f01c 100644
--- a/rate_table_test.cpp
+++ b/rate_table_test.cpp
@@ -32,7 +32,7 @@
#include <boost/filesystem/operations.hpp>
#include <fstream>
-#include <iomanip> // std::setw(), std::setfill()
+#include <iomanip> // setw(), setfill()
#include <ios>
#include <sstream>
#include <stdexcept>
diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index a6b2cdb..d9f3df0 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -31,16 +31,16 @@
#include <boost/filesystem/convenience.hpp> // extension()
#include <boost/filesystem/operations.hpp> // is_directory(),
directory_iterator
-#include <algorithm> // std::sort()
-#include <cstdio> // std::fflush()
-#include <cstdlib> // std::atoi()
+#include <algorithm> // sort()
+#include <cstdio> // fflush()
+#include <cstdlib> // atoi()
#include <exception>
#include <fstream>
-#include <iomanip> // std::setw(), std::setfill()
-#include <iostream> // std::cout, std::cerr
+#include <iomanip> // setw(), setfill()
+#include <iostream> // cout, cerr
#include <map>
-#include <memory> // std::unique_ptr
-#include <ostream> // std::endl
+#include <memory> // unique_ptr
+#include <ostream> // endl
#include <sstream>
#include <stdexcept>
#include <string>
diff --git a/round_test.cpp b/round_test.cpp
index 8a0b571..e755795 100644
--- a/round_test.cpp
+++ b/round_test.cpp
@@ -37,9 +37,9 @@
#include "fenv_lmi.hpp"
#include "test_tools.hpp"
-#include <algorithm> // std::max()
-#include <cmath> // std::round()
-#include <cstddef> // std::size_t
+#include <algorithm> // max()
+#include <cmath> // round()
+#include <cstddef> // size_t
#include <ios>
#include <iostream>
#include <math.h> // ::round[,f,l]() and kin
diff --git a/round_to_test.cpp b/round_to_test.cpp
index 103117a..e62fe1f 100644
--- a/round_to_test.cpp
+++ b/round_to_test.cpp
@@ -26,8 +26,8 @@
#include "fenv_lmi.hpp"
#include "test_tools.hpp"
-#include <algorithm> // std::max()
-#include <cstddef> // std::size_t
+#include <algorithm> // max()
+#include <cstddef> // size_t
#include <ios>
#include <iostream>
#include <ostream>
diff --git a/rounding_view_editor.cpp b/rounding_view_editor.cpp
index 69ee335..6c69288 100644
--- a/rounding_view_editor.cpp
+++ b/rounding_view_editor.cpp
@@ -39,7 +39,7 @@
#include <map>
#include <ostream>
#include <sstream>
-#include <utility> // std::pair
+#include <utility> // pair
namespace
{
diff --git a/rtti_lmi.hpp b/rtti_lmi.hpp
index df1aa7a..e4745f7 100644
--- a/rtti_lmi.hpp
+++ b/rtti_lmi.hpp
@@ -25,7 +25,7 @@
#include "config.hpp"
#if defined __GNUC__
-# include <cstdlib> // std::free()
+# include <cstdlib> // free()
# include <cxxabi.h>
#endif // defined __GNUC__
diff --git a/skeleton.cpp b/skeleton.cpp
index 5bfcb07..ff3e07f 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -100,7 +100,7 @@
#include <wx/utils.h> // wxMilliSleep(), wxSafeYield()
#include <wx/xrc/xmlres.h>
-#include <iterator> // std::insert_iterator
+#include <iterator> // insert_iterator
#include <sstream>
#include <stdexcept>
#include <string>
diff --git a/snprintf_test.cpp b/snprintf_test.cpp
index 75373dc..3730e3d 100644
--- a/snprintf_test.cpp
+++ b/snprintf_test.cpp
@@ -23,7 +23,7 @@
#include "test_tools.hpp"
-#include <stdio.h> // std::snprintf()
+#include <stdio.h> // snprintf()
#include <string>
int test_main(int, char*[])
diff --git a/solve.cpp b/solve.cpp
index a1acc3c..dd88807 100644
--- a/solve.cpp
+++ b/solve.cpp
@@ -31,7 +31,7 @@
#include "outlay.hpp"
#include "zero.hpp"
-#include <algorithm> // std::max(), std::min()
+#include <algorithm> // max(), min()
/*
IHS !! These issues have been addressed in lmi, but not here:
diff --git a/stl_extensions.hpp b/stl_extensions.hpp
index 1baa402..6174fa3 100644
--- a/stl_extensions.hpp
+++ b/stl_extensions.hpp
@@ -53,8 +53,8 @@
#include "config.hpp"
-#include <functional> // std::multiplies(), std::plus()
-#include <stdexcept> // std::logic_error()
+#include <functional> // multiplies, plus
+#include <stdexcept> // logic_error
namespace nonstd
{
diff --git a/stratified_algorithms.hpp b/stratified_algorithms.hpp
index b1f65f9..351e5c2 100644
--- a/stratified_algorithms.hpp
+++ b/stratified_algorithms.hpp
@@ -27,7 +27,7 @@
#include "assert_lmi.hpp"
#include "miscellany.hpp" // minmax
-#include <algorithm> // std::is_sorted(), std::upper_bound()
+#include <algorithm> // is_sorted(), upper_bound()
#include <functional>
#include <vector>
diff --git a/stratified_algorithms_test.cpp b/stratified_algorithms_test.cpp
index 952862a..f3fc2e1 100644
--- a/stratified_algorithms_test.cpp
+++ b/stratified_algorithms_test.cpp
@@ -27,7 +27,7 @@
#include "miscellany.hpp" // lmi_array_size()
#include "test_tools.hpp"
-#include <cmath> // std::fabs()
+#include <cmath> // fabs()
#include <limits>
void banded_test()
diff --git a/stream_cast.hpp b/stream_cast.hpp
index 744dce1..2d5d192 100644
--- a/stream_cast.hpp
+++ b/stream_cast.hpp
@@ -49,7 +49,7 @@
#include "facets.hpp"
#include "rtti_lmi.hpp"
-#include <istream> // std::ws
+#include <istream> // ws
#include <sstream>
#include <stdexcept>
#include <string>
diff --git a/system_command_test.cpp b/system_command_test.cpp
index 8a52590..827b744 100644
--- a/system_command_test.cpp
+++ b/system_command_test.cpp
@@ -26,7 +26,7 @@
#include "miscellany.hpp"
#include "test_tools.hpp"
-#include <cstdio> // std::remove()
+#include <cstdio> // remove()
#include <fstream>
int test_main(int, char*[])
diff --git a/system_command_wx.cpp b/system_command_wx.cpp
index 2fe5fb3..8d071a3 100644
--- a/system_command_wx.cpp
+++ b/system_command_wx.cpp
@@ -32,7 +32,7 @@
#include <wx/frame.h>
#include <wx/utils.h>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <ostream>
LMI_FORCE_LINKING_IN_SITU(system_command_wx)
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index b22b4b3..1dd049f 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -32,8 +32,8 @@
#include <boost/filesystem/path.hpp>
#include <boost/regex.hpp>
-#include <algorithm> // std::is_sorted()
-#include <cstddef> // std::size_t
+#include <algorithm> // is_sorted()
+#include <cstddef> // size_t
#include <ctime>
#include <iomanip>
#include <ios>
@@ -42,7 +42,7 @@
#include <ostream>
#include <set>
#include <sstream>
-#include <stdexcept> // std::runtime_error
+#include <stdexcept> // runtime_error
#include <string>
std::string my_taboo_indulgence(); // See 'my_test_coding_rules.cpp'.
diff --git a/tier_view.hpp b/tier_view.hpp
index d7d28a3..7e59896 100644
--- a/tier_view.hpp
+++ b/tier_view.hpp
@@ -26,7 +26,7 @@
#include "product_editor.hpp"
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
class TierDocument;
class TierTableAdapter;
diff --git a/tier_view_editor.hpp b/tier_view_editor.hpp
index 5cdcf14..346a2a0 100644
--- a/tier_view_editor.hpp
+++ b/tier_view_editor.hpp
@@ -32,9 +32,9 @@
#include <wx/version.h> // Mark this file as wx dependent.
-#include <memory> // std::shared_ptr
+#include <memory> // shared_ptr
#include <string>
-#include <utility> // std::pair
+#include <utility> // pair
#include <vector>
/// Notes on TierEditorGrid and TierTableAdapter.
diff --git a/timer_test.cpp b/timer_test.cpp
index 801e8c5..7c2f6e3 100644
--- a/timer_test.cpp
+++ b/timer_test.cpp
@@ -28,7 +28,7 @@
#include "test_tools.hpp"
#include <cmath>
-#include <functional> // std::bind()
+#include <functional> // bind()
inline void do_nothing()
{}
diff --git a/tn_range.tpp b/tn_range.tpp
index 50954d5..d520792 100644
--- a/tn_range.tpp
+++ b/tn_range.tpp
@@ -24,7 +24,7 @@
#include "alert.hpp"
#include "value_cast.hpp"
-#include <cmath> // std::pow(), std::signbit()
+#include <cmath> // pow(), signbit()
#include <exception>
#include <istream>
#include <limits>
diff --git a/tn_range_test.cpp b/tn_range_test.cpp
index 5d115a4..e545c11 100644
--- a/tn_range_test.cpp
+++ b/tn_range_test.cpp
@@ -27,7 +27,7 @@
#include "test_tools.hpp"
-#include <algorithm> // std::min()
+#include <algorithm> // min()
#include <sstream>
// This should fail to compile:
diff --git a/value_cast_test.cpp b/value_cast_test.cpp
index 2918ba4..e497ce4 100644
--- a/value_cast_test.cpp
+++ b/value_cast_test.cpp
@@ -28,8 +28,8 @@
#include <boost/lexical_cast.hpp>
-#include <cmath> // std::scalbn()
-#include <cstring> // std::strcpy(), std::strcmp
+#include <cmath> // scalbn()
+#include <cstring> // strcpy(), strcmp()
#include <istream>
#include <limits>
#include <ostream>
diff --git a/vector_test.cpp b/vector_test.cpp
index df3507d..ef95188 100644
--- a/vector_test.cpp
+++ b/vector_test.cpp
@@ -30,7 +30,7 @@
#include "timer.hpp"
#include <algorithm>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <functional>
#include <iomanip>
#include <ios>
diff --git a/view_ex.cpp b/view_ex.cpp
index 8d47773..762850a 100644
--- a/view_ex.cpp
+++ b/view_ex.cpp
@@ -55,7 +55,7 @@
#include <wx/menu.h>
#include <wx/xrc/xmlres.h>
-#include <cstdlib> // std::exit(), EXIT_FAILURE
+#include <cstdlib> // exit(), EXIT_FAILURE
IMPLEMENT_ABSTRACT_CLASS(ViewEx, wxView)
diff --git a/wx_new.hpp b/wx_new.hpp
index 4b26b5a..b8f8108 100644
--- a/wx_new.hpp
+++ b/wx_new.hpp
@@ -26,7 +26,7 @@
#include "so_attributes.hpp"
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#if defined LMI_WX_NEW_USE_SO_ATTRIBUTES && !defined UNIT_TESTING_WX_NEW
#
diff --git a/wx_table_generator.hpp b/wx_table_generator.hpp
index 238d77a..3e3f657 100644
--- a/wx_table_generator.hpp
+++ b/wx_table_generator.hpp
@@ -27,7 +27,7 @@
#include <wx/dc.h>
#include <wx/font.h>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <string>
#include <vector>
diff --git a/wx_test_benchmark_census.cpp b/wx_test_benchmark_census.cpp
index 556d28a..eddb3f7 100644
--- a/wx_test_benchmark_census.cpp
+++ b/wx_test_benchmark_census.cpp
@@ -34,7 +34,7 @@
#include <boost/filesystem/operations.hpp>
-#include <cmath> // std::fabs()
+#include <cmath> // fabs()
namespace
{
diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index e1f6390..5275184 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -36,7 +36,7 @@
#include <wx/testing.h>
#include <wx/uiaction.h>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
namespace
{
diff --git a/wx_test_input_sequences.cpp b/wx_test_input_sequences.cpp
index 05211c9..3bf375a 100644
--- a/wx_test_input_sequences.cpp
+++ b/wx_test_input_sequences.cpp
@@ -30,7 +30,7 @@
#include <wx/testing.h>
#include <wx/uiaction.h>
-#include <algorithm> // std::find()
+#include <algorithm> // find()
/// Validate a variety of input sequences in the GUI input dialog.
///
diff --git a/wx_utility.cpp b/wx_utility.cpp
index b70e2d8..8069986 100644
--- a/wx_utility.cpp
+++ b/wx_utility.cpp
@@ -40,7 +40,7 @@
#include <wx/utils.h> // wxSafeYield()
#include <wx/window.h>
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <sstream>
/// Return whatever plain text the clipboard contains, or an empty
diff --git a/xml_lmi.hpp b/xml_lmi.hpp
index a7909b7..81ab6b9 100644
--- a/xml_lmi.hpp
+++ b/xml_lmi.hpp
@@ -28,9 +28,9 @@
#include <xmlwrapp/node.h> // xml::element
-#include <cstddef> // std::size_t
+#include <cstddef> // size_t
#include <iosfwd>
-#include <memory> // std::unique_ptr
+#include <memory> // unique_ptr
#include <string>
/// Interface to xmlwrapp.
diff --git a/xml_serializable.tpp b/xml_serializable.tpp
index 8cfe451..c6d804e 100644
--- a/xml_serializable.tpp
+++ b/xml_serializable.tpp
@@ -31,8 +31,8 @@
#include <xmlwrapp/nodes_view.h>
-#include <algorithm> // std::copy(), std::find()
-#include <iterator> // std::back_inserter()
+#include <algorithm> // copy(), find()
+#include <iterator> // back_inserter()
#include <sstream>
#include <type_traits>
#include <vector>
diff --git a/yare_input.cpp b/yare_input.cpp
index 5f3e706..552409e 100644
--- a/yare_input.cpp
+++ b/yare_input.cpp
@@ -27,7 +27,7 @@
#include "input_sequence_aux.hpp" // convert_vector_type()
#include "miscellany.hpp" // each_equal()
-#include <numeric> // std::accumulate()
+#include <numeric> // accumulate()
yare_input::yare_input(Input const& z)
{