[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 2c94c87 4/4: Replace boost with std shared_pt
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 2c94c87 4/4: Replace boost with std shared_ptr |
|
Date: |
Mon, 23 Jan 2017 12:42:15 +0000 (UTC) |
branch: master
commit 2c94c87cdb9ab68fd4a9b9747507996d0453be86
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Replace boost with std shared_ptr
---
account_value.hpp | 11 +++++------
accountvalue.cpp | 2 +-
basic_values.hpp | 33 ++++++++++++++++-----------------
cache_file_reads.hpp | 4 ++--
census_view.hpp | 5 ++---
database.cpp | 6 +++---
database.hpp | 5 ++---
database_view.hpp | 4 ++--
database_view_editor.hpp | 11 +++++------
emit_ledger.hpp | 5 +++--
group_quote_pdf_gen.cpp | 2 +-
group_quote_pdf_gen.hpp | 7 +++----
group_quote_pdf_gen_wx.cpp | 4 ++--
group_values.cpp | 10 +++++-----
group_values.hpp | 6 +++---
ihs_acctval.cpp | 2 +-
illustration_view.cpp | 2 +-
illustration_view.hpp | 8 ++++----
illustrator.cpp | 2 +-
illustrator.hpp | 6 +++---
ledger.cpp | 4 ++--
ledger.hpp | 7 +++----
ledgervalues.cpp | 2 +-
ledgervalues.hpp | 7 +++----
multidimgrid_any.cpp | 2 +-
multidimgrid_any.hpp | 14 +++++++-------
pchlist.hpp | 1 -
progress_meter.cpp | 2 +-
progress_meter.hpp | 7 +++----
progress_meter_cgi.cpp | 4 ++--
progress_meter_cli.cpp | 4 ++--
progress_meter_test.cpp | 14 +++++++-------
progress_meter_wx.cpp | 4 ++--
tier_view.hpp | 4 ++--
tier_view_editor.cpp | 4 ++--
tier_view_editor.hpp | 7 +++----
36 files changed, 106 insertions(+), 116 deletions(-)
diff --git a/account_value.hpp b/account_value.hpp
index 675ad58..374bdb5 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -29,10 +29,9 @@
#include "so_attributes.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
#include <iosfwd>
#include <fstream>
+#include <memory> // std::shared_ptr
#include <string>
#include <vector>
@@ -91,7 +90,7 @@ class LMI_SO AccountValue
,int ThatSolveEndYear
);
- boost::shared_ptr<Ledger const> ledger_from_av() const;
+ std::shared_ptr<Ledger const> ledger_from_av() const;
private:
LedgerInvariant const& InvariantValues() const;
@@ -323,9 +322,9 @@ class LMI_SO AccountValue
bool SolvingForGuarPremium;
bool ItLapsed;
- boost::shared_ptr<Ledger > ledger_;
- boost::shared_ptr<LedgerInvariant> ledger_invariant_;
- boost::shared_ptr<LedgerVariant > ledger_variant_;
+ std::shared_ptr<Ledger > ledger_;
+ std::shared_ptr<LedgerInvariant> ledger_invariant_;
+ std::shared_ptr<LedgerVariant > ledger_variant_;
oenum_increment_method deduction_method;
oenum_increment_account_preference deduction_preferred_account;
diff --git a/accountvalue.cpp b/accountvalue.cpp
index edd7edf..e72e9c5 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -131,7 +131,7 @@ AccountValue::AccountValue(Input const& input)
AccountValue::~AccountValue() = default;
//============================================================================
-boost::shared_ptr<Ledger const> AccountValue::ledger_from_av() const
+std::shared_ptr<Ledger const> AccountValue::ledger_from_av() const
{
LMI_ASSERT(ledger_.get());
return ledger_;
diff --git a/basic_values.hpp b/basic_values.hpp
index a93132a..eb37fe9 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -33,8 +33,7 @@
#include "uncopyable_lmi.hpp"
#include "yare_input.hpp"
-#include <boost/shared_ptr.hpp>
-
+#include <memory> // std::shared_ptr
#include <string>
#include <vector>
@@ -114,21 +113,21 @@ class LMI_SO BasicValues
mcenum_state GetPremiumTaxState() const;
double InvestmentManagementFee() const;
- yare_input yare_input_;
- boost::shared_ptr<product_data> ProductData_;
- boost::shared_ptr<product_database> Database_;
- boost::shared_ptr<FundData> FundData_;
- boost::shared_ptr<rounding_rules> RoundingRules_;
- boost::shared_ptr<stratified_charges> StratifiedCharges_;
- boost::shared_ptr<MortalityRates> MortalityRates_;
- boost::shared_ptr<InterestRates> InterestRates_;
- boost::shared_ptr<SurrChgRates> SurrChgRates_;
- boost::shared_ptr<death_benefits> DeathBfts_;
- boost::shared_ptr<modal_outlay> Outlay_;
- boost::shared_ptr<premium_tax> PremiumTax_;
- boost::shared_ptr<Loads> Loads_;
- boost::shared_ptr<Irc7702> Irc7702_;
- boost::shared_ptr<Irc7702A> Irc7702A_;
+ yare_input yare_input_;
+ std::shared_ptr<product_data> ProductData_;
+ std::shared_ptr<product_database> Database_;
+ std::shared_ptr<FundData> FundData_;
+ std::shared_ptr<rounding_rules> RoundingRules_;
+ std::shared_ptr<stratified_charges> StratifiedCharges_;
+ std::shared_ptr<MortalityRates> MortalityRates_;
+ std::shared_ptr<InterestRates> InterestRates_;
+ std::shared_ptr<SurrChgRates> SurrChgRates_;
+ std::shared_ptr<death_benefits> DeathBfts_;
+ std::shared_ptr<modal_outlay> Outlay_;
+ std::shared_ptr<premium_tax> PremiumTax_;
+ std::shared_ptr<Loads> Loads_;
+ std::shared_ptr<Irc7702> Irc7702_;
+ std::shared_ptr<Irc7702A> Irc7702A_;
double GetAnnualTgtPrem(int a_year, double a_specamt) const;
diff --git a/cache_file_reads.hpp b/cache_file_reads.hpp
index 74a2eb7..f9ade75 100644
--- a/cache_file_reads.hpp
+++ b/cache_file_reads.hpp
@@ -28,10 +28,10 @@
#include "uncopyable_lmi.hpp"
#include <boost/filesystem/operations.hpp>
-#include <boost/shared_ptr.hpp>
#include <ctime> // std::time_t
#include <map>
+#include <memory> // std::shared_ptr
#include <string>
#include <utility> // std::make_pair()
@@ -61,7 +61,7 @@ class file_cache
:private lmi::uncopyable<file_cache<T> >
{
public:
- using retrieved_type = boost::shared_ptr<T>;
+ using retrieved_type = std::shared_ptr<T>;
static file_cache<T>& instance()
{
diff --git a/census_view.hpp b/census_view.hpp
index a8c0295..6621f5f 100644
--- a/census_view.hpp
+++ b/census_view.hpp
@@ -33,10 +33,9 @@
#include "oecumenic_enumerations.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
#include <wx/object.h> // wxObjectDataPtr
+#include <memory> // std::shared_ptr
#include <string>
#include <vector>
@@ -127,7 +126,7 @@ class CensusView
bool autosize_columns_;
- boost::shared_ptr<Ledger const> composite_ledger_;
+ std::shared_ptr<Ledger const> composite_ledger_;
wxDataViewCtrl* list_window_;
wxObjectDataPtr<CensusViewDataViewModel> list_model_;
diff --git a/database.cpp b/database.cpp
index dd3236c..ec17e19 100644
--- a/database.cpp
+++ b/database.cpp
@@ -179,9 +179,9 @@ namespace
///
/// Postcondition: returned pointer is not null; throws otherwise.
-boost::shared_ptr<DBDictionary> antediluvian_db()
+std::shared_ptr<DBDictionary> antediluvian_db()
{
- boost::shared_ptr<DBDictionary> z(new DBDictionary);
+ std::shared_ptr<DBDictionary> z(new DBDictionary);
z->InitAntediluvian();
LMI_ASSERT(z);
return z;
@@ -196,7 +196,7 @@ void product_database::initialize(std::string const&
product_name)
{
if(is_antediluvian_fork())
{
- static boost::shared_ptr<DBDictionary> z(antediluvian_db());
+ static std::shared_ptr<DBDictionary> z(antediluvian_db());
db_ = z;
}
else
diff --git a/database.hpp b/database.hpp
index b4069d3..8691095 100644
--- a/database.hpp
+++ b/database.hpp
@@ -31,8 +31,7 @@
#include "so_attributes.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
+#include <memory> // std::shared_ptr
#include <string>
#include <vector>
@@ -85,7 +84,7 @@ class LMI_SO product_database
int length_;
int maturity_age_;
- boost::shared_ptr<DBDictionary> db_;
+ std::shared_ptr<DBDictionary> db_;
};
#endif // database_hpp
diff --git a/database_view.hpp b/database_view.hpp
index 0de0c6c..588a736 100644
--- a/database_view.hpp
+++ b/database_view.hpp
@@ -29,7 +29,7 @@
#include "obstruct_slicing.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
+#include <memory> // std::shared_ptr
class DatabaseDocument;
class DatabaseTableAdapter;
@@ -64,7 +64,7 @@ class DatabaseView
void UponTreeSelectionChange(wxTreeEvent&);
- boost::shared_ptr<DatabaseTableAdapter> const table_adapter_;
+ std::shared_ptr<DatabaseTableAdapter> const table_adapter_;
DECLARE_DYNAMIC_CLASS(DatabaseView)
DECLARE_EVENT_TABLE()
diff --git a/database_view_editor.hpp b/database_view_editor.hpp
index 763b211..1307ce6 100644
--- a/database_view_editor.hpp
+++ b/database_view_editor.hpp
@@ -38,18 +38,17 @@
#include "dbvalue.hpp"
-#include <boost/shared_ptr.hpp>
-
+#include <memory> // std::shared_ptr
#include <string>
/// Database dictionary adapter for database_entity class
///
/// One could mention Adaptor pattern.
/// It does not really owns the database_entity instance which is passed to it.
-/// The boost::shared_ptr does.
+/// The std::shared_ptr does.
/// Regarding the fact that all the instances of database_entity are reside
/// in the DBDictionary object and owned by it, one could pass entity via
-/// boost::shared_ptr constructed with deallocator object that does nothing.
+/// std::shared_ptr constructed with deallocator object that does nothing.
class DatabaseTableAdapter
:public MultiDimTable<double, DatabaseTableAdapter>
@@ -148,7 +147,7 @@ class DatabaseEditorGrid
public:
DatabaseEditorGrid
(wxWindow*
- ,boost::shared_ptr<DatabaseTableAdapter> const&
+ ,std::shared_ptr<DatabaseTableAdapter> const&
,wxWindowID = wxID_ANY
,wxPoint const& = wxDefaultPosition
,wxSize const& = wxDefaultSize
@@ -157,7 +156,7 @@ class DatabaseEditorGrid
inline DatabaseEditorGrid::DatabaseEditorGrid
(wxWindow* parent
- ,boost::shared_ptr<DatabaseTableAdapter> const& table
+ ,std::shared_ptr<DatabaseTableAdapter> const& table
,wxWindowID id
,wxPoint const& pos
,wxSize const& size
diff --git a/emit_ledger.hpp b/emit_ledger.hpp
index 12e0422..52a4318 100644
--- a/emit_ledger.hpp
+++ b/emit_ledger.hpp
@@ -30,7 +30,8 @@
#include "uncopyable_lmi.hpp"
#include <boost/filesystem/path.hpp>
-#include <boost/shared_ptr.hpp>
+
+#include <memory> // std::shared_ptr
class group_quote_pdf_generator;
class Ledger;
@@ -62,7 +63,7 @@ class LMI_SO ledger_emitter
fs::path case_filepath_group_quote_;
// Used only if emission_ includes mce_emit_group_quote; empty otherwise.
- boost::shared_ptr<group_quote_pdf_generator> group_quote_gen_;
+ std::shared_ptr<group_quote_pdf_generator> group_quote_gen_;
};
double LMI_SO emit_ledger
diff --git a/group_quote_pdf_gen.cpp b/group_quote_pdf_gen.cpp
index 500e734..164903a 100644
--- a/group_quote_pdf_gen.cpp
+++ b/group_quote_pdf_gen.cpp
@@ -40,7 +40,7 @@ bool group_quote_pdf_generator::set_creator(creator_type f)
return true;
}
-boost::shared_ptr<group_quote_pdf_generator>
group_quote_pdf_generator::create()
+std::shared_ptr<group_quote_pdf_generator> group_quote_pdf_generator::create()
{
return group_quote_pdf_generator_create_callback()();
}
diff --git a/group_quote_pdf_gen.hpp b/group_quote_pdf_gen.hpp
index 12df809..a2ffe8c 100644
--- a/group_quote_pdf_gen.hpp
+++ b/group_quote_pdf_gen.hpp
@@ -27,8 +27,7 @@
#include "so_attributes.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
+#include <memory> // std::shared_ptr
#include <string>
class Ledger;
@@ -45,10 +44,10 @@ class LMI_SO group_quote_pdf_generator
:private lmi::uncopyable<group_quote_pdf_generator>
{
public:
- typedef boost::shared_ptr<group_quote_pdf_generator> (*creator_type)();
+ typedef std::shared_ptr<group_quote_pdf_generator> (*creator_type)();
static bool set_creator(creator_type);
- static boost::shared_ptr<group_quote_pdf_generator> create();
+ static std::shared_ptr<group_quote_pdf_generator> create();
virtual ~group_quote_pdf_generator();
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index 340bf6d..940dc2b 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -470,9 +470,9 @@ class group_quote_pdf_generator_wx
:public group_quote_pdf_generator
{
public:
- static boost::shared_ptr<group_quote_pdf_generator> do_create()
+ static std::shared_ptr<group_quote_pdf_generator> do_create()
{
- return boost::shared_ptr<group_quote_pdf_generator>
+ return std::shared_ptr<group_quote_pdf_generator>
(new group_quote_pdf_generator_wx()
);
}
diff --git a/group_values.cpp b/group_values.cpp
index 5c23d8a..d6fc01e 100644
--- a/group_values.cpp
+++ b/group_values.cpp
@@ -117,7 +117,7 @@ census_run_result run_census_in_series::operator()
{
Timer timer;
census_run_result result;
- boost::shared_ptr<progress_meter> meter
+ std::shared_ptr<progress_meter> meter
(create_progress_meter
(cells.size()
,"Calculating all cells"
@@ -240,7 +240,7 @@ census_run_result run_census_in_parallel::operator()
{
Timer timer;
census_run_result result;
- boost::shared_ptr<progress_meter> meter
+ std::shared_ptr<progress_meter> meter
(create_progress_meter
(cells.size()
,"Initializing all cells"
@@ -251,7 +251,7 @@ census_run_result run_census_in_parallel::operator()
ledger_emitter emitter(file, emission);
std::vector<Input>::const_iterator ip;
- std::vector<boost::shared_ptr<AccountValue> > cell_values;
+ std::vector<std::shared_ptr<AccountValue> > cell_values;
std::vector<mcenum_run_basis> const& RunBases = composite.GetRunBases();
int j = 0;
@@ -267,7 +267,7 @@ census_run_result run_census_in_parallel::operator()
{
{ // Begin fenv_guard scope.
fenv_guard fg;
- boost::shared_ptr<AccountValue> av(new AccountValue(*ip));
+ std::shared_ptr<AccountValue> av(new AccountValue(*ip));
std::string const name(cells[j]["InsuredName"].str());
// Indexing: here, j is an index into cells, not cell_values.
av->SetDebugFilename
@@ -746,7 +746,7 @@ census_run_result run_census::operator()
return result;
}
-boost::shared_ptr<Ledger const> run_census::composite() const
+std::shared_ptr<Ledger const> run_census::composite() const
{
LMI_ASSERT(composite_.get());
return composite_;
diff --git a/group_values.hpp b/group_values.hpp
index 3e356b8..8eae242 100644
--- a/group_values.hpp
+++ b/group_values.hpp
@@ -29,8 +29,8 @@
#include "so_attributes.hpp"
#include <boost/filesystem/path.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory> // std::shared_ptr
#include <vector>
class Input;
@@ -85,10 +85,10 @@ class LMI_SO run_census
,std::vector<Input> const& cells
);
- boost::shared_ptr<Ledger const> composite() const;
+ std::shared_ptr<Ledger const> composite() const;
private:
- boost::shared_ptr<Ledger> composite_;
+ std::shared_ptr<Ledger> composite_;
};
#endif // group_values_hpp
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 0032062..0599b31 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -182,7 +182,7 @@ AccountValue::AccountValue(Input const& input)
AccountValue::~AccountValue() = default;
//============================================================================
-boost::shared_ptr<Ledger const> AccountValue::ledger_from_av() const
+std::shared_ptr<Ledger const> AccountValue::ledger_from_av() const
{
LMI_ASSERT(ledger_.get());
return ledger_;
diff --git a/illustration_view.cpp b/illustration_view.cpp
index 95ec372..5ccc0b8 100644
--- a/illustration_view.cpp
+++ b/illustration_view.cpp
@@ -328,7 +328,7 @@ void IllustrationView::Run(Input* overriding_input)
///
/// custom_io_0_run_if_file_exists() uses this function similarly.
-void IllustrationView::SetLedger(boost::shared_ptr<Ledger const> ledger)
+void IllustrationView::SetLedger(std::shared_ptr<Ledger const> ledger)
{
ledger_values_ = ledger;
LMI_ASSERT(ledger_values_.get());
diff --git a/illustration_view.hpp b/illustration_view.hpp
index 566fcc8..e6e5e33 100644
--- a/illustration_view.hpp
+++ b/illustration_view.hpp
@@ -39,10 +39,10 @@
#include "oecumenic_enumerations.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
#include <wx/event.h>
+#include <memory> // std::shared_ptr
+
class IllustrationDocument;
class Input;
class Ledger;
@@ -68,7 +68,7 @@ class IllustrationView
//
void DisplaySelectedValuesAsHtml();
void Run(Input* = nullptr);
- void SetLedger(boost::shared_ptr<Ledger const>);
+ void SetLedger(std::shared_ptr<Ledger const>);
private:
IllustrationDocument& document() const;
@@ -102,7 +102,7 @@ class IllustrationView
wxHtmlWindow* html_window_;
bool is_phony_;
- boost::shared_ptr<Ledger const> ledger_values_;
+ std::shared_ptr<Ledger const> ledger_values_;
DECLARE_DYNAMIC_CLASS(IllustrationView)
DECLARE_EVENT_TABLE()
diff --git a/illustrator.cpp b/illustrator.cpp
index 559d14a..e3c260f 100644
--- a/illustrator.cpp
+++ b/illustrator.cpp
@@ -163,7 +163,7 @@ void illustrator::conditionally_show_timings_on_stdout()
const
/// illustration, it's the one and only ledger. For a multiple-cell
/// illustration, it's the composite ledger.
-boost::shared_ptr<Ledger const> illustrator::principal_ledger() const
+std::shared_ptr<Ledger const> illustrator::principal_ledger() const
{
LMI_ASSERT(principal_ledger_.get());
return principal_ledger_;
diff --git a/illustrator.hpp b/illustrator.hpp
index 6d314e5..b890109 100644
--- a/illustrator.hpp
+++ b/illustrator.hpp
@@ -29,9 +29,9 @@
#include "so_attributes.hpp"
#include <boost/filesystem/path.hpp>
-#include <boost/shared_ptr.hpp>
#include <functional>
+#include <memory> // std::shared_ptr
#include <vector>
class Input;
@@ -55,7 +55,7 @@ class LMI_SO illustrator
void conditionally_show_timings_on_stdout() const;
- boost::shared_ptr<Ledger const> principal_ledger() const;
+ std::shared_ptr<Ledger const> principal_ledger() const;
double seconds_for_input () const;
double seconds_for_calculations() const;
@@ -63,7 +63,7 @@ class LMI_SO illustrator
private:
mcenum_emission emission_;
- boost::shared_ptr<Ledger const> principal_ledger_;
+ std::shared_ptr<Ledger const> principal_ledger_;
double seconds_for_input_;
double seconds_for_calculations_;
double seconds_for_output_;
diff --git a/ledger.cpp b/ledger.cpp
index 4f3b2c0..5262ecb 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -40,8 +40,8 @@
// Ledger Ledger::Clone() const
// {
// Ledger new_ledger(*this);
-// new_ledger.ledger_map_ =
boost::shared_ptr<ledger_map_holder>(new ledger_map_holder(*ledger_map_));
-// new_ledger.ledger_invariant_ = boost::shared_ptr<LedgerInvariant>(new
LedgerInvariant(*ledger_invariant_));
+// new_ledger.ledger_map_ = std::shared_ptr<ledger_map_holder>(new
ledger_map_holder(*ledger_map_));
+// new_ledger.ledger_invariant_ = std::shared_ptr<LedgerInvariant>(new
LedgerInvariant(*ledger_invariant_));
// return new_ledger;
// }
// that would make unshared copies? If not, then Clone() would be
diff --git a/ledger.hpp b/ledger.hpp
index fae79c4..e374277 100644
--- a/ledger.hpp
+++ b/ledger.hpp
@@ -28,9 +28,8 @@
#include "so_attributes.hpp"
#include "xml_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
#include <iosfwd>
+#include <memory> // std::shared_ptr
#include <string>
#include <vector>
@@ -137,8 +136,8 @@ class LMI_SO Ledger
// composites but not for all cells.
double composite_lapse_year_;
- boost::shared_ptr<ledger_map_holder> ledger_map_;
- boost::shared_ptr<LedgerInvariant> ledger_invariant_;
+ std::shared_ptr<ledger_map_holder> ledger_map_;
+ std::shared_ptr<LedgerInvariant> ledger_invariant_;
// It is convenient to have a vector that holds just the run bases,
// i.e. just the key_type members of ledger_map_. We can use this for
diff --git a/ledgervalues.cpp b/ledgervalues.cpp
index c69bdcb..bba9a5f 100644
--- a/ledgervalues.cpp
+++ b/ledgervalues.cpp
@@ -48,7 +48,7 @@ double IllusVal::run(Input const& input)
return z;
}
-boost::shared_ptr<Ledger const> IllusVal::ledger() const
+std::shared_ptr<Ledger const> IllusVal::ledger() const
{
LMI_ASSERT(ledger_.get());
return ledger_;
diff --git a/ledgervalues.hpp b/ledgervalues.hpp
index c814f2a..2dbecb4 100644
--- a/ledgervalues.hpp
+++ b/ledgervalues.hpp
@@ -28,8 +28,7 @@
#include "so_attributes.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
+#include <memory> // std::shared_ptr
#include <string>
class Input;
@@ -49,11 +48,11 @@ class IllusVal
double run(Input const&);
- boost::shared_ptr<Ledger const> ledger() const;
+ std::shared_ptr<Ledger const> ledger() const;
private:
std::string filename_;
- boost::shared_ptr<Ledger const> ledger_;
+ std::shared_ptr<Ledger const> ledger_;
};
#endif // ledgervalues_hpp
diff --git a/multidimgrid_any.cpp b/multidimgrid_any.cpp
index 040f356..400802d 100644
--- a/multidimgrid_any.cpp
+++ b/multidimgrid_any.cpp
@@ -309,7 +309,7 @@ MultiDimGrid::~MultiDimGrid()
bool MultiDimGrid::Create
(wxWindow* parent
- ,boost::shared_ptr<MultiDimTableAny> const& atable
+ ,std::shared_ptr<MultiDimTableAny> const& atable
,wxWindowID id
,wxPoint const& pos
,wxSize const& size
diff --git a/multidimgrid_any.hpp b/multidimgrid_any.hpp
index 5cd499f..bd72eb9 100644
--- a/multidimgrid_any.hpp
+++ b/multidimgrid_any.hpp
@@ -93,12 +93,12 @@
#include "uncopyable_lmi.hpp"
#include <boost/any.hpp>
-#include <boost/shared_ptr.hpp>
#include <wx/grid.h>
#include <wx/choice.h>
#include <cstddef> // std::size_t
+#include <memory> // std::shared_ptr
#include <string>
#include <utility> // std::pair
#include <vector>
@@ -287,7 +287,7 @@ class MultiDimTableAny
public:
/// Coordinates for an element of the table
typedef std::vector<boost::any> Coords;
- typedef boost::shared_ptr<MultiDimAxisAny> AxisAnyPtr;
+ typedef std::shared_ptr<MultiDimAxisAny> AxisAnyPtr;
typedef std::vector<AxisAnyPtr> AxesAny;
MultiDimTableAny() = default;
@@ -481,14 +481,14 @@ class MultiDimGrid
MultiDimGrid
(wxWindow* parent
- ,boost::shared_ptr<MultiDimTableAny> const& table
+ ,std::shared_ptr<MultiDimTableAny> const& table
,wxWindowID id = wxID_ANY
,wxPoint const& pos = wxDefaultPosition
,wxSize const& size = wxDefaultSize
);
bool Create
(wxWindow* parent
- ,boost::shared_ptr<MultiDimTableAny> const& table
+ ,std::shared_ptr<MultiDimTableAny> const& table
,wxWindowID id = wxID_ANY
,wxPoint const& pos = wxDefaultPosition
,wxSize const& size = wxDefaultSize
@@ -560,13 +560,13 @@ class MultiDimGrid
private:
/// Shared pointer to an axis object
- typedef boost::shared_ptr<MultiDimAxisAny> AxisPtr;
+ typedef std::shared_ptr<MultiDimAxisAny> AxisPtr;
/// Container of (pointers to) axis objects.
typedef std::vector<AxisPtr> Axis;
/// Common part of all ctors
void Init();
/// Shared pointer to the data table.
- boost::shared_ptr<MultiDimTableAny> table_;
+ std::shared_ptr<MultiDimTableAny> table_;
/// Array (std::vector) of shared pointer to axis.
Axis axis_;
/// Cache variable - number of dimensions
@@ -701,7 +701,7 @@ inline MultiDimGrid::MultiDimGrid()
}
inline MultiDimGrid::MultiDimGrid
(wxWindow* parent
- ,boost::shared_ptr<MultiDimTableAny> const& table
+ ,std::shared_ptr<MultiDimTableAny> const& table
,wxWindowID id
,wxPoint const& pos
,wxSize const& size
diff --git a/pchlist.hpp b/pchlist.hpp
index b32e04a..cb506e5 100644
--- a/pchlist.hpp
+++ b/pchlist.hpp
@@ -102,7 +102,6 @@
# include <boost/filesystem/convenience.hpp>
# include <boost/filesystem/operations.hpp>
# include <boost/filesystem/path.hpp>
-# include <boost/shared_ptr.hpp>
# include <cstddef>
# include <cstdlib>
diff --git a/progress_meter.cpp b/progress_meter.cpp
index 5805316..eecaa1b 100644
--- a/progress_meter.cpp
+++ b/progress_meter.cpp
@@ -36,7 +36,7 @@ std::ostringstream& progress_meter_unit_test_stream()
progress_meter_creator_type progress_meter_creator = nullptr;
-boost::shared_ptr<progress_meter> create_progress_meter
+std::shared_ptr<progress_meter> create_progress_meter
(int max_count
,std::string const& title
,progress_meter::enum_display_mode display_mode
diff --git a/progress_meter.hpp b/progress_meter.hpp
index 6939a9b..140b6f6 100644
--- a/progress_meter.hpp
+++ b/progress_meter.hpp
@@ -193,9 +193,8 @@
#include "so_attributes.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
-
#include <iosfwd>
+#include <memory> // std::shared_ptr
#include <string>
std::ostringstream& LMI_SO progress_meter_unit_test_stream();
@@ -245,13 +244,13 @@ class LMI_SO progress_meter
bool was_cancelled_;
};
-boost::shared_ptr<progress_meter> LMI_SO create_progress_meter
+std::shared_ptr<progress_meter> LMI_SO create_progress_meter
(int max_count
,std::string const& title = ""
,progress_meter::enum_display_mode = progress_meter::e_normal_display
);
-typedef boost::shared_ptr<progress_meter> (*progress_meter_creator_type)
+typedef std::shared_ptr<progress_meter> (*progress_meter_creator_type)
(int max_count
,std::string const& title
,progress_meter::enum_display_mode
diff --git a/progress_meter_cgi.cpp b/progress_meter_cgi.cpp
index aedf30f..34fcc9f 100644
--- a/progress_meter_cgi.cpp
+++ b/progress_meter_cgi.cpp
@@ -75,13 +75,13 @@ void concrete_progress_meter::culminate_ui()
{
}
-boost::shared_ptr<progress_meter> concrete_progress_meter_creator
+std::shared_ptr<progress_meter> concrete_progress_meter_creator
(int max_count
,std::string const& title
,progress_meter::enum_display_mode display_mode
)
{
- return boost::shared_ptr<progress_meter>
+ return std::shared_ptr<progress_meter>
(new concrete_progress_meter(max_count, title, display_mode)
);
}
diff --git a/progress_meter_cli.cpp b/progress_meter_cli.cpp
index c76f586..5978fc6 100644
--- a/progress_meter_cli.cpp
+++ b/progress_meter_cli.cpp
@@ -121,13 +121,13 @@ void concrete_progress_meter::culminate_ui()
os_ << std::endl;
}
-boost::shared_ptr<progress_meter> concrete_progress_meter_creator
+std::shared_ptr<progress_meter> concrete_progress_meter_creator
(int max_count
,std::string const& title
,progress_meter::enum_display_mode display_mode
)
{
- return boost::shared_ptr<progress_meter>
+ return std::shared_ptr<progress_meter>
(new concrete_progress_meter(max_count, title, display_mode)
);
}
diff --git a/progress_meter_test.cpp b/progress_meter_test.cpp
index c0e3efd..4362f09 100644
--- a/progress_meter_test.cpp
+++ b/progress_meter_test.cpp
@@ -53,7 +53,7 @@ void progress_meter_test::test_normal_usage()
{
progress_meter_unit_test_stream().str("");
int const max_count = 3;
- boost::shared_ptr<progress_meter> meter
+ std::shared_ptr<progress_meter> meter
(create_progress_meter
(max_count
,"Some title"
@@ -78,7 +78,7 @@ void progress_meter_test::test_normal_usage()
void progress_meter_test::test_quiet_display_mode()
{
int const max_count = 3;
- boost::shared_ptr<progress_meter> meter
+ std::shared_ptr<progress_meter> meter
(create_progress_meter
(max_count
,"ERROR: THIS SHOULD NOT DISPLAY"
@@ -97,7 +97,7 @@ void progress_meter_test::test_distinct_metered_operations()
progress_meter_unit_test_stream().str("");
int const max_count = 3;
- boost::shared_ptr<progress_meter> meter0
+ std::shared_ptr<progress_meter> meter0
(create_progress_meter
(max_count
,"Operation 0"
@@ -111,7 +111,7 @@ void progress_meter_test::test_distinct_metered_operations()
meter0->culminate();
// Use a different shared pointer.
- boost::shared_ptr<progress_meter> meter1
+ std::shared_ptr<progress_meter> meter1
(create_progress_meter
(max_count
,"Operation 1"
@@ -146,7 +146,7 @@ void
progress_meter_test::test_empty_title_and_zero_max_count()
{
progress_meter_unit_test_stream().str("");
int const max_count = 0;
- boost::shared_ptr<progress_meter> meter
+ std::shared_ptr<progress_meter> meter
(create_progress_meter
(max_count
,""
@@ -169,7 +169,7 @@ void progress_meter_test::test_invalid_display_mode()
progress_meter_unit_test_stream().str("");
int const max_count = 0;
BOOST_TEST_THROW
- (boost::shared_ptr<progress_meter> meter
+ (std::shared_ptr<progress_meter> meter
(create_progress_meter
(max_count
,""
@@ -185,7 +185,7 @@ void progress_meter_test::test_postcondition_failure()
{
progress_meter_unit_test_stream().str("");
int const max_count = 3;
- boost::shared_ptr<progress_meter> meter
+ std::shared_ptr<progress_meter> meter
(create_progress_meter
(max_count
,"Some title"
diff --git a/progress_meter_wx.cpp b/progress_meter_wx.cpp
index c64c70d..ab3cef4 100644
--- a/progress_meter_wx.cpp
+++ b/progress_meter_wx.cpp
@@ -142,13 +142,13 @@ void concrete_progress_meter::culminate_ui()
{
}
-boost::shared_ptr<progress_meter> concrete_progress_meter_creator
+std::shared_ptr<progress_meter> concrete_progress_meter_creator
(int max_count
,std::string const& title
,progress_meter::enum_display_mode display_mode
)
{
- return boost::shared_ptr<progress_meter>
+ return std::shared_ptr<progress_meter>
(new concrete_progress_meter(max_count, title, display_mode)
);
}
diff --git a/tier_view.hpp b/tier_view.hpp
index 855e514..b73f1e1 100644
--- a/tier_view.hpp
+++ b/tier_view.hpp
@@ -29,7 +29,7 @@
#include "obstruct_slicing.hpp"
#include "uncopyable_lmi.hpp"
-#include <boost/shared_ptr.hpp>
+#include <memory> // std::shared_ptr
class TierDocument;
class TierTableAdapter;
@@ -62,7 +62,7 @@ class TierView
void UponTreeSelectionChange(wxTreeEvent&);
- boost::shared_ptr<TierTableAdapter> table_adapter_;
+ std::shared_ptr<TierTableAdapter> table_adapter_;
DECLARE_DYNAMIC_CLASS(TierView)
DECLARE_EVENT_TABLE()
diff --git a/tier_view_editor.cpp b/tier_view_editor.cpp
index c44c624..ac80cdb 100644
--- a/tier_view_editor.cpp
+++ b/tier_view_editor.cpp
@@ -197,7 +197,7 @@ TierEditorGrid::~TierEditorGrid() = default;
TierEditorGrid::TierEditorGrid
(wxWindow* parent
- ,boost::shared_ptr<TierTableAdapter> const& table
+ ,std::shared_ptr<TierTableAdapter> const& table
,wxWindowID id
,wxPoint const& pos
,wxSize const& size
@@ -212,7 +212,7 @@ TierEditorGrid::TierEditorGrid
bool TierEditorGrid::Create
(wxWindow* parent
- ,boost::shared_ptr<TierTableAdapter> const& table
+ ,std::shared_ptr<TierTableAdapter> const& table
,wxWindowID id
,wxPoint const& pos
,wxSize const& size
diff --git a/tier_view_editor.hpp b/tier_view_editor.hpp
index b90cd7c..cd6c06c 100644
--- a/tier_view_editor.hpp
+++ b/tier_view_editor.hpp
@@ -30,10 +30,9 @@
#include "alert.hpp"
-#include <boost/shared_ptr.hpp>
-
#include <wx/version.h> // Mark this file as wx dependent.
+#include <memory> // std::shared_ptr
#include <string>
#include <utility> // std::pair
#include <vector>
@@ -331,7 +330,7 @@ class TierEditorGrid
TierEditorGrid
(wxWindow* parent
- ,boost::shared_ptr<TierTableAdapter> const& table
+ ,std::shared_ptr<TierTableAdapter> const& table
,wxWindowID id = wxID_ANY
,wxPoint const& pos = wxDefaultPosition
,wxSize const& size = wxDefaultSize
@@ -339,7 +338,7 @@ class TierEditorGrid
bool Create
(wxWindow* parent
- ,boost::shared_ptr<TierTableAdapter> const& table
+ ,std::shared_ptr<TierTableAdapter> const& table
,wxWindowID id = wxID_ANY
,wxPoint const& pos = wxDefaultPosition
,wxSize const& size = wxDefaultSize