[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c1198b8 1/4: Fix using of LMI_SO macros for f
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master c1198b8 1/4: Fix using of LMI_SO macros for functions |
|
Date: |
Sun, 18 Oct 2020 12:02:30 -0400 (EDT) |
branch: master
commit c1198b8a62ae81d7efa9ee755998f3dd5da0d8f9
Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Fix using of LMI_SO macros for functions
---
alert.hpp | 32 ++++++++++++++++----------------
authenticity.hpp | 2 +-
basic_tables.cpp | 12 ++++++------
basic_tables.hpp | 10 +++++-----
calendar_date.hpp | 20 ++++++++++----------
configurable_settings.hpp | 4 ++--
cso_table.hpp | 4 ++--
custom_io_0.hpp | 6 +++---
custom_io_1.hpp | 6 +++---
data_directory.hpp | 2 +-
database_view.cpp | 4 ++--
dbdict.hpp | 2 +-
dbnames.hpp | 6 +++---
dbvalue.hpp | 2 +-
emit_ledger.hpp | 2 +-
facets.hpp | 4 ++--
fenv_lmi.hpp | 18 +++++++++---------
file_command.hpp | 2 +-
ihs_irc7702a.hpp | 2 +-
ihs_server7702.hpp | 2 +-
illustrator.hpp | 4 ++--
input_sequence_aux.hpp | 2 +-
input_sequence_interval.hpp | 2 +-
interpolate_string.hpp | 2 +-
ledger.hpp | 4 ++--
ledger_text_formats.hpp | 16 ++++++++--------
license.hpp | 8 ++++----
lmi.hpp | 2 +-
mc_enum_types_aux.hpp | 16 ++++++++--------
miscellany.hpp | 14 +++++++-------
null_stream.hpp | 4 ++--
path_utility.cpp | 2 +-
path_utility.hpp | 14 +++++++-------
pdf_command.hpp | 4 ++--
product_data.hpp | 4 ++--
progress_meter.hpp | 6 +++---
report_table.hpp | 4 ++--
rounding_rules.hpp | 4 ++--
sigfpe.hpp | 4 ++--
stratified_charges.hpp | 10 +++++-----
system_command.hpp | 4 ++--
verify_products.hpp | 2 +-
42 files changed, 137 insertions(+), 137 deletions(-)
diff --git a/alert.hpp b/alert.hpp
index 9665ce9..8bd0e11 100644
--- a/alert.hpp
+++ b/alert.hpp
@@ -158,15 +158,15 @@
namespace alert_classes{} // doxygen workaround.
-std::ostream& LMI_SO status();
-std::ostream& LMI_SO warning();
-std::ostream& LMI_SO hobsons_choice();
-std::ostream& LMI_SO alarum();
+LMI_SO std::ostream& status();
+LMI_SO std::ostream& warning();
+LMI_SO std::ostream& hobsons_choice();
+LMI_SO std::ostream& alarum();
-void LMI_SO safely_show_on_stderr(char const*);
+LMI_SO void safely_show_on_stderr(char const*);
-void LMI_SO safely_show_message(char const*);
-void LMI_SO safely_show_message(std::string const&);
+LMI_SO void safely_show_message(char const*);
+LMI_SO void safely_show_message(std::string const&);
// Implement these functions for each platform. Any might throw an
// exception, which normally would be caught by the standard library
@@ -200,7 +200,7 @@ void safe_message_alert (char const*);
/// here:
/// https://lists.nongnu.org/archive/html/lmi/2005-11/msg00016.html
-bool LMI_SO set_alert_functions
+LMI_SO bool set_alert_functions
(void(*status_alert_function_pointer )(std::string const&)
,void(*warning_alert_function_pointer )(std::string const&)
,void(*hobsons_choice_alert_function_pointer)(std::string const&)
@@ -220,7 +220,7 @@ bool LMI_SO set_alert_functions
/// stderr and signals an exception. A server application probably
/// should fail and write a message in a log file.
-std::string const& LMI_SO hobsons_prompt();
+LMI_SO std::string const& hobsons_prompt();
/// Rejecting Hobson's Choice throws a distinctive exception. Design
/// intention: a user interface can catch this and take appropriate
@@ -243,15 +243,15 @@ class hobsons_choice_exception
/// library to demonstrate that alerts can be raised there and
/// processed in the main application.
-void LMI_SO test_status();
-void LMI_SO test_warning();
-void LMI_SO test_hobsons_choice();
-void LMI_SO test_alarum();
+LMI_SO void test_status();
+LMI_SO void test_warning();
+LMI_SO void test_hobsons_choice();
+LMI_SO void test_alarum();
[[noreturn]]
-void LMI_SO test_standard_exception();
+LMI_SO void test_standard_exception();
[[noreturn]]
-void LMI_SO test_arbitrary_exception();
-void LMI_SO test_catastrophe_report();
+LMI_SO void test_arbitrary_exception();
+LMI_SO void test_catastrophe_report();
/// Write file name and line number to diagnostic stream, and flush.
diff --git a/authenticity.hpp b/authenticity.hpp
index 7e2da72..73dfefe 100644
--- a/authenticity.hpp
+++ b/authenticity.hpp
@@ -66,7 +66,7 @@ class Authenticity final
/// Terminate the program immediately if authentication fails. But
/// skip authentication altogether for the most-privileged password.
-void LMI_SO authenticate_system();
+LMI_SO void authenticate_system();
/// Name of file containing md5sums of secured files.
diff --git a/basic_tables.cpp b/basic_tables.cpp
index 810e29f..5a311c0 100644
--- a/basic_tables.cpp
+++ b/basic_tables.cpp
@@ -90,7 +90,7 @@ std::vector<double> basic_table_rates
#endif // 0
}
-std::vector<double> LMI_SO irc_7702_q_builtin
+std::vector<double> irc_7702_q_builtin
(product_database const& db
,int issue_age
,int years_to_maturity
@@ -117,7 +117,7 @@ std::vector<double> LMI_SO irc_7702_q_builtin
}
} // Unnamed namespace.
-std::vector<double> LMI_SO irc_7702_q
+std::vector<double> irc_7702_q
(product_data const& product
,product_database const& database
,int issue_age
@@ -149,7 +149,7 @@ std::vector<double> LMI_SO irc_7702_q
throw "Unreachable--silences a compiler diagnostic.";
}
-std::vector<double> LMI_SO irc_7702A_7pp
+std::vector<double> irc_7702A_7pp
(product_data const& product
,product_database const& database
,int issue_age
@@ -177,7 +177,7 @@ std::vector<double> LMI_SO irc_7702A_7pp
throw "Unreachable--silences a compiler diagnostic.";
}
-std::vector<double> LMI_SO irc_7702_nsp
+std::vector<double> irc_7702_nsp
(product_data const& product
,product_database const& database
,int issue_age
@@ -209,7 +209,7 @@ std::vector<double> LMI_SO irc_7702_nsp
throw "Unreachable--silences a compiler diagnostic.";
}
-std::vector<double> LMI_SO cvat_corridor_factors
+std::vector<double> cvat_corridor_factors
(product_data const& product
,product_database const& database
,int issue_age
@@ -237,7 +237,7 @@ std::vector<double> LMI_SO cvat_corridor_factors
throw "Unreachable--silences a compiler diagnostic.";
}
-std::vector<double> LMI_SO target_premium_rates
+std::vector<double> target_premium_rates
(product_data const& product
,product_database const& database
,int issue_age
diff --git a/basic_tables.hpp b/basic_tables.hpp
index 954f29c..a94ef13 100644
--- a/basic_tables.hpp
+++ b/basic_tables.hpp
@@ -31,35 +31,35 @@
class LMI_SO_FWD_DECL product_data;
class LMI_SO_FWD_DECL product_database;
-std::vector<double> LMI_SO irc_7702_q
+LMI_SO std::vector<double> irc_7702_q
(product_data const& product
,product_database const& database
,int issue_age
,int years_to_maturity
);
-std::vector<double> LMI_SO irc_7702A_7pp
+LMI_SO std::vector<double> irc_7702A_7pp
(product_data const& product
,product_database const& database
,int issue_age
,int years_to_maturity
);
-std::vector<double> LMI_SO irc_7702_nsp
+LMI_SO std::vector<double> irc_7702_nsp
(product_data const& product
,product_database const& database
,int issue_age
,int years_to_maturity
);
-std::vector<double> LMI_SO cvat_corridor_factors
+LMI_SO std::vector<double> cvat_corridor_factors
(product_data const& product
,product_database const& database
,int issue_age
,int years_to_maturity
);
-std::vector<double> LMI_SO target_premium_rates
+LMI_SO std::vector<double> target_premium_rates
(product_data const& product
,product_database const& database
,int issue_age
diff --git a/calendar_date.hpp b/calendar_date.hpp
index d1bb9aa..a236b48 100644
--- a/calendar_date.hpp
+++ b/calendar_date.hpp
@@ -68,8 +68,8 @@ class ymd_t
int value_;
};
-ymd_t LMI_SO JdnToYmd(jdn_t);
-jdn_t LMI_SO YmdToJdn(ymd_t);
+LMI_SO ymd_t JdnToYmd(jdn_t);
+LMI_SO jdn_t YmdToJdn(ymd_t);
/// Class calendar_date represents a gregorian-calendar date in the
/// range [1752-09-14, 9999-12-31]. Date calculations are probably
@@ -174,12 +174,12 @@ class LMI_SO calendar_date
mutable int cached_day_;
};
-calendar_date LMI_SO operator+(int, calendar_date);
-calendar_date LMI_SO operator+(calendar_date, int);
-calendar_date LMI_SO operator-(calendar_date, int);
+LMI_SO calendar_date operator+(int, calendar_date);
+LMI_SO calendar_date operator+(calendar_date, int);
+LMI_SO calendar_date operator-(calendar_date, int);
-std::ostream& LMI_SO operator<<(std::ostream&, calendar_date const&);
-std::istream& LMI_SO operator>>(std::istream&, calendar_date&);
+LMI_SO std::ostream& operator<<(std::ostream&, calendar_date const&);
+LMI_SO std::istream& operator>>(std::istream&, calendar_date&);
calendar_date add_years
(calendar_date const& date
@@ -237,8 +237,8 @@ std::string month_name(int);
// Some particularly useful dates.
-calendar_date const& LMI_SO gregorian_epoch();
-calendar_date const& LMI_SO last_yyyy_date();
-calendar_date LMI_SO today();
+LMI_SO calendar_date const& gregorian_epoch();
+LMI_SO calendar_date const& last_yyyy_date();
+LMI_SO calendar_date today();
#endif // calendar_date_hpp
diff --git a/configurable_settings.hpp b/configurable_settings.hpp
index f8eac12..a1f1b0e 100644
--- a/configurable_settings.hpp
+++ b/configurable_settings.hpp
@@ -110,10 +110,10 @@ class LMI_SO configurable_settings final
bool use_builtin_calculation_summary_;
};
-std::string const& LMI_SO configuration_filepath();
+LMI_SO std::string const& configuration_filepath();
std::vector<std::string> input_calculation_summary_columns();
// This function must be visible to 'wx_test_calculation_summary.cpp'.
-std::vector<std::string> LMI_SO effective_calculation_summary_columns();
+LMI_SO std::vector<std::string> effective_calculation_summary_columns();
#endif // configurable_settings_hpp
diff --git a/cso_table.hpp b/cso_table.hpp
index 4b21d8b..074e6d5 100644
--- a/cso_table.hpp
+++ b/cso_table.hpp
@@ -30,7 +30,7 @@
#include <vector>
-std::vector<double> LMI_SO cso_table
+LMI_SO std::vector<double> cso_table
(mcenum_cso_era
,oenum_autopisty
,oenum_alb_or_anb
@@ -40,7 +40,7 @@ std::vector<double> LMI_SO cso_table
,int max_age
);
-std::vector<double> LMI_SO cso_table
+LMI_SO std::vector<double> cso_table
(mcenum_cso_era
,oenum_autopisty
,oenum_alb_or_anb
diff --git a/custom_io_0.hpp b/custom_io_0.hpp
index 5cc6b92..a5bfe0d 100644
--- a/custom_io_0.hpp
+++ b/custom_io_0.hpp
@@ -31,7 +31,7 @@
class Input;
class Ledger;
-bool LMI_SO custom_io_0_file_exists();
+LMI_SO bool custom_io_0_file_exists();
// These two functions take std::string arguments that either contain
// filenames or are blank. If they're blank, as they normally are,
@@ -43,7 +43,7 @@ bool LMI_SO custom_io_0_file_exists();
// that input and output files share a common stem; in this custom
// situation, that need not be the case.
-bool LMI_SO custom_io_0_read (Input& , std::string const& filename);
-void LMI_SO custom_io_0_write(Ledger const&, std::string const& filename);
+LMI_SO bool custom_io_0_read (Input& , std::string const& filename);
+LMI_SO void custom_io_0_write(Ledger const&, std::string const& filename);
#endif // custom_io_0_hpp
diff --git a/custom_io_1.hpp b/custom_io_1.hpp
index 75a5da9..5f30130 100644
--- a/custom_io_1.hpp
+++ b/custom_io_1.hpp
@@ -31,7 +31,7 @@
class Input;
class Ledger;
-bool LMI_SO custom_io_1_file_exists();
+LMI_SO bool custom_io_1_file_exists();
// These two functions take std::string arguments that either contain
// filenames or are blank. If they're blank, as they normally are,
@@ -43,7 +43,7 @@ bool LMI_SO custom_io_1_file_exists();
// that input and output files share a common stem; in this custom
// situation, that need not be the case.
-bool LMI_SO custom_io_1_read (Input& , std::string const& filename);
-void LMI_SO custom_io_1_write(Ledger const&, std::string const& filename);
+LMI_SO bool custom_io_1_read (Input& , std::string const& filename);
+LMI_SO void custom_io_1_write(Ledger const&, std::string const& filename);
#endif // custom_io_1_hpp
diff --git a/data_directory.hpp b/data_directory.hpp
index 34544d5..b323b2b 100644
--- a/data_directory.hpp
+++ b/data_directory.hpp
@@ -28,6 +28,6 @@
#include <string>
-std::string LMI_SO AddDataDir(std::string const& filename);
+LMI_SO std::string AddDataDir(std::string const& filename);
#endif // data_directory_hpp
diff --git a/database_view.cpp b/database_view.cpp
index 560c0a5..cd5524f 100644
--- a/database_view.cpp
+++ b/database_view.cpp
@@ -62,7 +62,7 @@ namespace
/// char const* ShortName;
/// The fields not included are of course accessed by indexing a
/// db_names object from the vector returned by this function:
-/// std::vector<db_names> const& LMI_SO GetDBNames();
+/// LMI_SO std::vector<db_names> const& GetDBNames();
/// Even db_names::Idx is accessed that way, and I think our
/// discussions have raised the issue of whether that member's value
/// should be asserted to equal the value of the loop counter in
@@ -77,7 +77,7 @@ namespace
///
/// (1) This class holds only an e_database_key enum. That's enough to
/// find the corresponding struct db_names in the vector returned by
-/// std::vector<db_names> const& LMI_SO GetDBNames();
+/// LMI_SO std::vector<db_names> const& GetDBNames();
/// and we can then access that struct's members directly. And we
/// don't have to know that description() here is 'LongName' there.
/// Then the only thing we have to worry about is mapping between
diff --git a/dbdict.hpp b/dbdict.hpp
index cb0a885..d0a78ef 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -439,6 +439,6 @@ class LMI_SO DBDictionary
database_entity SecondaryHurdle ;
};
-void LMI_SO print_databases();
+LMI_SO void print_databases();
#endif // dbdict_hpp
diff --git a/dbnames.hpp b/dbnames.hpp
index f0f0a5a..12bac7c 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -589,9 +589,9 @@ struct db_names
char const* LongName;
};
-std::vector<db_names> const& LMI_SO GetDBNames();
+LMI_SO std::vector<db_names> const& GetDBNames();
-int LMI_SO db_key_from_name(std::string const&);
-std::string LMI_SO db_name_from_key(int);
+LMI_SO int db_key_from_name(std::string const&);
+LMI_SO std::string db_name_from_key(int);
#endif // dbnames_hpp
diff --git a/dbvalue.hpp b/dbvalue.hpp
index 7452a89..a52189e 100644
--- a/dbvalue.hpp
+++ b/dbvalue.hpp
@@ -108,7 +108,7 @@ class LMI_SO database_entity final
std::string gloss_;
};
-std::vector<int> const& LMI_SO maximum_database_dimensions();
+LMI_SO std::vector<int> const& maximum_database_dimensions();
/*
Some data are scalar by nature--for example, DB_MaturityAge.
diff --git a/emit_ledger.hpp b/emit_ledger.hpp
index b407a53..edeee08 100644
--- a/emit_ledger.hpp
+++ b/emit_ledger.hpp
@@ -65,7 +65,7 @@ class LMI_SO ledger_emitter final
std::unique_ptr<group_quote_pdf_generator> group_quote_pdf_gen_;
};
-double LMI_SO emit_ledger
+LMI_SO double emit_ledger
(fs::path const& cell_filepath
,Ledger const& ledger
,mcenum_emission emission
diff --git a/facets.hpp b/facets.hpp
index 1e64ecf..c94eabf 100644
--- a/facets.hpp
+++ b/facets.hpp
@@ -28,7 +28,7 @@
#include <locale>
-std::locale const& LMI_SO blank_is_not_whitespace_locale();
-std::locale const& LMI_SO tab_is_not_whitespace_locale();
+LMI_SO std::locale const& blank_is_not_whitespace_locale();
+LMI_SO std::locale const& tab_is_not_whitespace_locale();
#endif // facets_hpp
diff --git a/fenv_lmi.hpp b/fenv_lmi.hpp
index 4066462..d012363 100644
--- a/fenv_lmi.hpp
+++ b/fenv_lmi.hpp
@@ -50,11 +50,11 @@
/// fe[gs]etprecision(). At least for now, they are meaningfully
/// implemented for x87 only.
///
-/// bool LMI_SO fenv_is_valid()
+/// LMI_SO bool fenv_is_valid()
/// If current floating-point environment matches lmi default, then
/// return 'true'; else return 'false'.
///
-/// bool LMI_SO fenv_validate();
+/// LMI_SO bool fenv_validate();
/// Make sure current floating-point environment matches lmi default.
/// If it doesn't, then reset it to lmi default, display a message,
/// and return 'false'; else return 'true'.
@@ -91,15 +91,15 @@ enum enum_fenv_indulgence
,e_fenv_indulge_0x027f = 0x027f
};
-void LMI_SO fenv_initialize();
+LMI_SO void fenv_initialize();
-e_ieee754_precision LMI_SO fenv_precision();
-void LMI_SO fenv_precision(e_ieee754_precision);
+LMI_SO e_ieee754_precision fenv_precision();
+LMI_SO void fenv_precision(e_ieee754_precision);
-e_ieee754_rounding LMI_SO fenv_rounding();
-void LMI_SO fenv_rounding(e_ieee754_rounding);
+LMI_SO e_ieee754_rounding fenv_rounding();
+LMI_SO void fenv_rounding(e_ieee754_rounding);
-bool LMI_SO fenv_is_valid();
-bool LMI_SO fenv_validate(enum_fenv_indulgence = e_fenv_indulge_nothing);
+LMI_SO bool fenv_is_valid();
+LMI_SO bool fenv_validate(enum_fenv_indulgence = e_fenv_indulge_nothing);
#endif // fenv_lmi_hpp
diff --git a/file_command.hpp b/file_command.hpp
index 18edffd..604a621 100644
--- a/file_command.hpp
+++ b/file_command.hpp
@@ -30,7 +30,7 @@
typedef void (*file_command_fp_type)(std::string const&, std::string const&);
-bool LMI_SO file_command_initialize(file_command_fp_type);
+LMI_SO bool file_command_initialize(file_command_fp_type);
/// Execute a named command for a file, choosing the appropriate
/// action based on the file's mime type (for gnome or kde) or its
diff --git a/ihs_irc7702a.hpp b/ihs_irc7702a.hpp
index cddbb9b..89de3d5 100644
--- a/ihs_irc7702a.hpp
+++ b/ihs_irc7702a.hpp
@@ -31,7 +31,7 @@
#include <vector>
-void LMI_SO TestIrc7702A();
+LMI_SO void TestIrc7702A();
// TAXATION !! TODO ?? Known defects:
// need to handle withdrawals correctly;
diff --git a/ihs_server7702.hpp b/ihs_server7702.hpp
index f14046d..029ed96 100644
--- a/ihs_server7702.hpp
+++ b/ihs_server7702.hpp
@@ -46,7 +46,7 @@ struct Server7702Output
double GuidelineSinglePremiumPolicyC; // the GSP for notional
policy C; 0.0 at issue or if there has been no adjustable event.
};
-Server7702Output LMI_SO RunServer7702FromStruct(gpt_input a_Input);
+LMI_SO Server7702Output RunServer7702FromStruct(gpt_input a_Input);
class Server7702
{
diff --git a/illustrator.hpp b/illustrator.hpp
index eaf9c35..67398ea 100644
--- a/illustrator.hpp
+++ b/illustrator.hpp
@@ -65,9 +65,9 @@ class LMI_SO illustrator final
double seconds_for_output_;
};
-Input const& LMI_SO default_cell();
+LMI_SO Input const& default_cell();
-void LMI_SO test_census_consensus
+LMI_SO void test_census_consensus
(mcenum_emission emission
,Input const& case_default
,std::vector<Input> const& all_cells
diff --git a/input_sequence_aux.hpp b/input_sequence_aux.hpp
index a813612..b287381 100644
--- a/input_sequence_aux.hpp
+++ b/input_sequence_aux.hpp
@@ -45,7 +45,7 @@ namespace detail
{
typedef std::map<std::string,std::string> stringmap;
- std::vector<std::string> LMI_SO extract_keys_from_string_map
+ LMI_SO std::vector<std::string> extract_keys_from_string_map
(stringmap const& keyword_dictionary
);
diff --git a/input_sequence_interval.hpp b/input_sequence_interval.hpp
index b5aedd8..402ab7c 100644
--- a/input_sequence_interval.hpp
+++ b/input_sequence_interval.hpp
@@ -58,6 +58,6 @@ struct ValueInterval
bool insane = false;
};
-std::string LMI_SO abridge_diagnostics(char const* what);
+LMI_SO std::string abridge_diagnostics(char const* what);
#endif // input_sequence_interval_hpp
diff --git a/interpolate_string.hpp b/interpolate_string.hpp
index 4a5d2d8..67c49a7 100644
--- a/interpolate_string.hpp
+++ b/interpolate_string.hpp
@@ -63,7 +63,7 @@ using lookup_function
/// Throw if the lookup function throws, if the string uses invalid syntax or
/// if the maximum recursion level is exceeded.
-std::string LMI_SO interpolate_string
+LMI_SO std::string interpolate_string
(char const* s
,lookup_function const& lookup
);
diff --git a/ledger.hpp b/ledger.hpp
index db92c75..4c6d059 100644
--- a/ledger.hpp
+++ b/ledger.hpp
@@ -140,7 +140,7 @@ std::vector<double> numeric_vector
,std::string const& compound_name
);
-bool LMI_SO is_interdicted (Ledger const&);
-void LMI_SO throw_if_interdicted(Ledger const&);
+LMI_SO bool is_interdicted (Ledger const&);
+LMI_SO void throw_if_interdicted(Ledger const&);
#endif // ledger_hpp
diff --git a/ledger_text_formats.hpp b/ledger_text_formats.hpp
index b16599f..5b7fd7c 100644
--- a/ledger_text_formats.hpp
+++ b/ledger_text_formats.hpp
@@ -34,22 +34,22 @@
class Ledger;
-std::string LMI_SO FormatSelectedValuesAsHtml(Ledger const&);
-std::string LMI_SO FormatSelectedValuesAsTsv (Ledger const&);
+LMI_SO std::string FormatSelectedValuesAsHtml(Ledger const&);
+LMI_SO std::string FormatSelectedValuesAsTsv (Ledger const&);
-void LMI_SO PrintCellTabDelimited (Ledger const&, std::string const&
file_name);
+LMI_SO void PrintCellTabDelimited (Ledger const&, std::string const&
file_name);
-void LMI_SO PrintRosterHeaders ( std::string const&
file_name);
-void LMI_SO PrintRosterTabDelimited(Ledger const&, std::string const&
file_name);
+LMI_SO void PrintRosterHeaders ( std::string const&
file_name);
+LMI_SO void PrintRosterTabDelimited(Ledger const&, std::string const&
file_name);
-void LMI_SO PrintLedgerFlatText (Ledger const&, std::ostream&);
+LMI_SO void PrintLedgerFlatText (Ledger const&, std::ostream&);
-std::string LMI_SO ledger_format
+LMI_SO std::string ledger_format
(double d
,std::pair<int,oenum_format_style> f
);
-std::vector<std::string> LMI_SO ledger_format
+LMI_SO std::vector<std::string> ledger_format
(std::vector<double> const& dv
,std::pair<int,oenum_format_style> f
);
diff --git a/license.hpp b/license.hpp
index 69f8cb2..171a6b3 100644
--- a/license.hpp
+++ b/license.hpp
@@ -36,9 +36,9 @@
// ensures that the license and its required notices are available
// unaltered.
-std::string const& LMI_SO license_as_html();
-std::string const& LMI_SO license_as_text();
-std::string const& LMI_SO license_notices_as_html();
-std::string const& LMI_SO license_notices_as_text();
+LMI_SO std::string const& license_as_html();
+LMI_SO std::string const& license_as_text();
+LMI_SO std::string const& license_notices_as_html();
+LMI_SO std::string const& license_notices_as_text();
#endif // license_hpp
diff --git a/lmi.hpp b/lmi.hpp
index 5294f23..e7537c7 100644
--- a/lmi.hpp
+++ b/lmi.hpp
@@ -28,6 +28,6 @@
/// Distinguish the antediluvian fork from production.
-bool LMI_SO is_antediluvian_fork();
+LMI_SO bool is_antediluvian_fork();
#endif // lmi_hpp
diff --git a/mc_enum_types_aux.hpp b/mc_enum_types_aux.hpp
index 996fca7..e029122 100644
--- a/mc_enum_types_aux.hpp
+++ b/mc_enum_types_aux.hpp
@@ -40,20 +40,20 @@ enum
,mc_n_rate_periods = 2
};
-std::vector<std::string> const& LMI_SO all_strings_gender ();
-std::vector<std::string> const& LMI_SO all_strings_class ();
-std::vector<std::string> const& LMI_SO all_strings_smoking ();
-std::vector<std::string> const& LMI_SO all_strings_uw_basis ();
-std::vector<std::string> const& LMI_SO all_strings_state ();
+LMI_SO std::vector<std::string> const& all_strings_gender ();
+LMI_SO std::vector<std::string> const& all_strings_class ();
+LMI_SO std::vector<std::string> const& all_strings_smoking ();
+LMI_SO std::vector<std::string> const& all_strings_uw_basis ();
+LMI_SO std::vector<std::string> const& all_strings_state ();
-std::vector<std::string> LMI_SO allowed_strings_emission();
+LMI_SO std::vector<std::string> allowed_strings_emission();
mcenum_dbopt_7702 effective_dbopt_7702
(mcenum_dbopt actual_dbopt
,mcenum_dbopt_7702 rop_equivalent
);
-bool LMI_SO is_subject_to_ill_reg(mcenum_ledger_type);
+LMI_SO bool is_subject_to_ill_reg(mcenum_ledger_type);
bool is_three_rate_finra(mcenum_ledger_type);
@@ -67,7 +67,7 @@ bool is_three_rate_finra(mcenum_ledger_type);
template<typename T>
std::string mc_str(T);
-mcenum_emission LMI_SO mc_emission_from_string(std::string const&);
+LMI_SO mcenum_emission mc_emission_from_string(std::string const&);
mcenum_state mc_state_from_string(std::string const&);
diff --git a/miscellany.hpp b/miscellany.hpp
index 0ce0085..6df0d3b 100644
--- a/miscellany.hpp
+++ b/miscellany.hpp
@@ -127,21 +127,21 @@ template<typename T> bool operator<=(T t, minmax<T> m)
{return t <= m.minimum();
template<typename T> bool operator< (minmax<T> m, T t) {return m.maximum() <
t;}
template<typename T> bool operator<=(minmax<T> m, T t) {return m.maximum() <=
t;}
-int LMI_SO scale_power(int max_power, double min_value, double max_value);
+LMI_SO int scale_power(int max_power, double min_value, double max_value);
-int LMI_SO count_newlines(std::string const&);
+LMI_SO int count_newlines(std::string const&);
-std::vector<std::string> LMI_SO split_into_lines(std::string const&);
+LMI_SO std::vector<std::string> split_into_lines(std::string const&);
std::string htmlize(std::string const&);
-bool LMI_SO begins_with(std::string const& s, std::string const& prefix);
+LMI_SO bool begins_with(std::string const& s, std::string const& prefix);
-bool LMI_SO ends_with(std::string const& s, std::string const& suffix);
+LMI_SO bool ends_with(std::string const& s, std::string const& suffix);
-void LMI_SO ltrim(std::string& s, char const* superfluous);
+LMI_SO void ltrim(std::string& s, char const* superfluous);
-void LMI_SO rtrim(std::string& s, char const* superfluous);
+LMI_SO void rtrim(std::string& s, char const* superfluous);
inline std::ios_base::openmode ios_in_binary()
{
diff --git a/null_stream.hpp b/null_stream.hpp
index 5b34bc2..742b34f 100644
--- a/null_stream.hpp
+++ b/null_stream.hpp
@@ -28,7 +28,7 @@
#include <iosfwd>
-std::streambuf& LMI_SO null_streambuf();
-std::ostream& LMI_SO null_stream();
+LMI_SO std::streambuf& null_streambuf();
+LMI_SO std::ostream& null_stream();
#endif // null_stream_hpp
diff --git a/path_utility.cpp b/path_utility.cpp
index a24972a..833aa13 100644
--- a/path_utility.cpp
+++ b/path_utility.cpp
@@ -130,7 +130,7 @@ void initialize_filesystem()
/// Notably, path("/bin/sh/") succeeds, silently discarding the
/// trailing '/'.
-fs::path LMI_SO modify_directory
+fs::path modify_directory
(fs::path const& original_filepath
,fs::path const& supplied_directory
)
diff --git a/path_utility.hpp b/path_utility.hpp
index 70ba68b..57da70f 100644
--- a/path_utility.hpp
+++ b/path_utility.hpp
@@ -31,35 +31,35 @@
#include <ostream>
#include <string>
-void LMI_SO initialize_filesystem(); // Listed first because of its importance.
+LMI_SO void initialize_filesystem(); // Listed first because of its importance.
-fs::path LMI_SO modify_directory
+LMI_SO fs::path modify_directory
(fs::path const& original_filepath
,fs::path const& supplied_directory
);
-std::string LMI_SO orthodox_filename
+LMI_SO std::string orthodox_filename
(std::string const& original_filename
);
-fs::path LMI_SO serial_file_path
+LMI_SO fs::path serial_file_path
(fs::path const& exemplar
,std::string const& personal_name
,int serial_number
,std::string const& extension
);
-fs::path LMI_SO unique_filepath
+LMI_SO fs::path unique_filepath
(fs::path const& original_filepath
,std::string const& supplied_extension
);
-void LMI_SO validate_directory
+LMI_SO void validate_directory
(std::string const& directory
,std::string const& context
);
-void LMI_SO validate_filepath
+LMI_SO void validate_filepath
(std::string const& filepath
,std::string const& context
);
diff --git a/pdf_command.hpp b/pdf_command.hpp
index 6535c51..7b6bca5 100644
--- a/pdf_command.hpp
+++ b/pdf_command.hpp
@@ -32,8 +32,8 @@ class Ledger;
typedef void (*pdf_command_fp_type)(Ledger const&, fs::path const&);
-bool LMI_SO pdf_command_initialize(pdf_command_fp_type);
+LMI_SO bool pdf_command_initialize(pdf_command_fp_type);
-void LMI_SO pdf_command(Ledger const&, fs::path const&);
+LMI_SO void pdf_command(Ledger const&, fs::path const&);
#endif // pdf_command_hpp
diff --git a/product_data.hpp b/product_data.hpp
index 5a40058..62b3ab7 100644
--- a/product_data.hpp
+++ b/product_data.hpp
@@ -370,7 +370,7 @@ class LMI_SO product_data
glossed_string DefnSpecAmt;
};
-void LMI_SO load(product_data &, fs::path const&);
-void LMI_SO save(product_data const&, fs::path const&);
+LMI_SO void load(product_data &, fs::path const&);
+LMI_SO void save(product_data const&, fs::path const&);
#endif // product_data_hpp
diff --git a/progress_meter.hpp b/progress_meter.hpp
index e3520c1..47dff8b 100644
--- a/progress_meter.hpp
+++ b/progress_meter.hpp
@@ -198,7 +198,7 @@
#include <memory> // unique_ptr
#include <string>
-std::ostringstream& LMI_SO progress_meter_unit_test_stream();
+LMI_SO std::ostringstream& progress_meter_unit_test_stream();
class LMI_SO progress_meter
{
@@ -249,7 +249,7 @@ class LMI_SO progress_meter
bool was_cancelled_;
};
-std::unique_ptr<progress_meter> LMI_SO create_progress_meter
+LMI_SO std::unique_ptr<progress_meter> create_progress_meter
(int max_count
,std::string const& title = std::string()
,progress_meter::enum_display_mode = progress_meter::e_normal_display
@@ -261,6 +261,6 @@ typedef std::unique_ptr<progress_meter>
(*progress_meter_creator_type)
,progress_meter::enum_display_mode
);
-bool LMI_SO set_progress_meter_creator(progress_meter_creator_type);
+LMI_SO bool set_progress_meter_creator(progress_meter_creator_type);
#endif // progress_meter_hpp
diff --git a/report_table.hpp b/report_table.hpp
index bbc21a0..aa81501 100644
--- a/report_table.hpp
+++ b/report_table.hpp
@@ -94,9 +94,9 @@ class LMI_SO table_column_info
bool const is_elastic_;
};
-std::vector<int> LMI_SO apportion(std::vector<int> const& votes, int seats);
+LMI_SO std::vector<int> apportion(std::vector<int> const& votes, int seats);
-std::vector<int> LMI_SO set_column_widths
+LMI_SO std::vector<int> set_column_widths
(std::vector<table_column_info> const& all_columns
,int max_table_width
,int desired_margin
diff --git a/rounding_rules.hpp b/rounding_rules.hpp
index 1a402b2..2bd6e4f 100644
--- a/rounding_rules.hpp
+++ b/rounding_rules.hpp
@@ -155,7 +155,7 @@ class LMI_SO rounding_rules final
rounding_parameters round_minutiae_ ;
};
-void LMI_SO load(rounding_rules &, fs::path const&);
-void LMI_SO save(rounding_rules const&, fs::path const&);
+LMI_SO void load(rounding_rules &, fs::path const&);
+LMI_SO void save(rounding_rules const&, fs::path const&);
#endif // rounding_rules_hpp
diff --git a/sigfpe.hpp b/sigfpe.hpp
index f42d132..12a1cac 100644
--- a/sigfpe.hpp
+++ b/sigfpe.hpp
@@ -26,9 +26,9 @@
#include "so_attributes.hpp"
-void LMI_SO floating_point_error_handler(int);
+LMI_SO void floating_point_error_handler(int);
// TODO ?? Make the unit test a separate module.
-void LMI_SO fpe_handler_test();
+LMI_SO void fpe_handler_test();
#endif // sigfpe_hpp
diff --git a/stratified_charges.hpp b/stratified_charges.hpp
index 071751c..6b91abb 100644
--- a/stratified_charges.hpp
+++ b/stratified_charges.hpp
@@ -208,11 +208,11 @@ class LMI_SO stratified_charges final
stratified_entity TieredSDPremTax;
};
-void LMI_SO load(stratified_charges &, fs::path const&);
-void LMI_SO save(stratified_charges const&, fs::path const&);
+LMI_SO void load(stratified_charges &, fs::path const&);
+LMI_SO void save(stratified_charges const&, fs::path const&);
-stratified_entity const& LMI_SO StatutoryAKPremTax();
-stratified_entity const& LMI_SO StatutoryDEPremTax();
-stratified_entity const& LMI_SO StatutorySDPremTax();
+LMI_SO stratified_entity const& StatutoryAKPremTax();
+LMI_SO stratified_entity const& StatutoryDEPremTax();
+LMI_SO stratified_entity const& StatutorySDPremTax();
#endif // stratified_charges_hpp
diff --git a/system_command.hpp b/system_command.hpp
index d43fabb..e767f5a 100644
--- a/system_command.hpp
+++ b/system_command.hpp
@@ -30,7 +30,7 @@
typedef void (*system_command_fp_type)(std::string const&);
-bool LMI_SO system_command_initialize(system_command_fp_type);
+LMI_SO bool system_command_initialize(system_command_fp_type);
/// Wrapper for std::system() that throws on failure.
///
@@ -66,6 +66,6 @@ bool LMI_SO system_command_initialize(system_command_fp_type);
/// that platform: it just makes it do what a posix platform would do
/// without such complicated workarounds.
-void LMI_SO system_command(std::string const& command_line);
+LMI_SO void system_command(std::string const& command_line);
#endif // system_command_hpp
diff --git a/verify_products.hpp b/verify_products.hpp
index 3d3d1ac..4160220 100644
--- a/verify_products.hpp
+++ b/verify_products.hpp
@@ -26,6 +26,6 @@
#include "so_attributes.hpp"
-void LMI_SO verify_products();
+LMI_SO void verify_products();
#endif // verify_products_hpp