[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [4982] Improve const-correctness
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [4982] Improve const-correctness |
|
Date: |
Fri, 11 Jun 2010 14:37:20 +0000 |
Revision: 4982
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4982
Author: chicares
Date: 2010-06-11 14:37:19 +0000 (Fri, 11 Jun 2010)
Log Message:
-----------
Improve const-correctness
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/antediluvian_stubs.cpp
lmi/trunk/configurable_settings.cpp
lmi/trunk/dbdict.cpp
lmi/trunk/dbdict.hpp
lmi/trunk/fund_data.cpp
lmi/trunk/input.hpp
lmi/trunk/input_xml_io.cpp
lmi/trunk/ledger.hpp
lmi/trunk/ledger_xml_io.cpp
lmi/trunk/mec_input.cpp
lmi/trunk/mec_input.hpp
lmi/trunk/mec_state.cpp
lmi/trunk/mec_state.hpp
lmi/trunk/mec_xml_document.cpp
lmi/trunk/mec_xml_document.hpp
lmi/trunk/multiple_cell_document.cpp
lmi/trunk/multiple_cell_document.hpp
lmi/trunk/product_data.cpp
lmi/trunk/product_data.hpp
lmi/trunk/rounding_rules.cpp
lmi/trunk/rounding_rules.hpp
lmi/trunk/single_cell_document.cpp
lmi/trunk/single_cell_document.hpp
lmi/trunk/stratified_charges.cpp
lmi/trunk/stratified_charges.hpp
lmi/trunk/xml_serializable.hpp
lmi/trunk/xml_serializable.tpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/ChangeLog 2010-06-11 14:37:19 UTC (rev 4982)
@@ -25984,3 +25984,40 @@
dbvalue.cpp
Eliminate even more gratuitous redundancy.
+20100610T1710Z <address@hidden> [704]
+
+ configurable_settings.cpp
+ configurable_settings.hpp
+Move documentation from header to implementation.
+
+20100611T1437Z <address@hidden> [704]
+
+ antediluvian_stubs.cpp
+ configurable_settings.cpp
+ dbdict.cpp
+ dbdict.hpp
+ fund_data.cpp
+ input.hpp
+ input_xml_io.cpp
+ ledger.hpp
+ ledger_xml_io.cpp
+ mec_input.cpp
+ mec_input.hpp
+ mec_state.cpp
+ mec_state.hpp
+ mec_xml_document.cpp
+ mec_xml_document.hpp
+ multiple_cell_document.cpp
+ multiple_cell_document.hpp
+ product_data.cpp
+ product_data.hpp
+ rounding_rules.cpp
+ rounding_rules.hpp
+ single_cell_document.cpp
+ single_cell_document.hpp
+ stratified_charges.cpp
+ stratified_charges.hpp
+ xml_serializable.hpp
+ xml_serializable.tpp
+Improve const-correctness.
+
Modified: lmi/trunk/antediluvian_stubs.cpp
===================================================================
--- lmi/trunk/antediluvian_stubs.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/antediluvian_stubs.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -81,7 +81,7 @@
return 0;
}
-std::string mec_state::xml_root_name() const
+std::string const& mec_state::xml_root_name() const
{
return empty_string;
}
@@ -102,7 +102,7 @@
return 0;
}
-std::string product_data::xml_root_name() const
+std::string const& product_data::xml_root_name() const
{
return empty_string;
}
Modified: lmi/trunk/configurable_settings.cpp
===================================================================
--- lmi/trunk/configurable_settings.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/configurable_settings.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -126,7 +126,7 @@
std::string const& xml_root_name()
{
- static std::string s("configurable_settings");
+ static std::string const s("configurable_settings");
return s;
}
} // Unnamed namespace.
Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/dbdict.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -452,9 +452,10 @@
return 0;
}
-std::string DBDictionary::xml_root_name() const
+std::string const& DBDictionary::xml_root_name() const
{
- return "database";
+ static std::string const s("database");
+ return s;
}
/// This override doesn't call redintegrate_ex_ante(); that wouldn't
Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/dbdict.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -74,8 +74,8 @@
static void InvalidateCache();
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual void read_element
Modified: lmi/trunk/fund_data.cpp
===================================================================
--- lmi/trunk/fund_data.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/fund_data.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -108,9 +108,10 @@
namespace
{
-std::string xml_root_name()
+std::string const& xml_root_name()
{
- return "funds";
+ static std::string const s("funds");
+ return s;
}
} // Unnamed namespace.
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/input.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -169,8 +169,8 @@
);
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual bool is_detritus(std::string const&) const;
@@ -180,9 +180,9 @@
,std::string & value
) const;
virtual void redintegrate_ex_post
- (int file_version
- ,std::map<std::string, std::string> detritus_map
- ,std::list<std::string> residuary_names
+ (int file_version
+ ,std::map<std::string, std::string> const& detritus_map
+ ,std::list<std::string> const& residuary_names
);
virtual void redintegrate_ad_terminum();
Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/input_xml_io.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -33,6 +33,7 @@
#include "calendar_date.hpp"
#include "contains.hpp"
#include "global_settings.hpp"
+#include "map_lookup.hpp"
#include "miscellany.hpp" // lmi_array_size()
#include <algorithm> // std::min()
@@ -82,9 +83,10 @@
return 5;
}
-std::string Input::xml_root_name() const
+std::string const& Input::xml_root_name() const
{
- return "cell";
+ static std::string const s("cell");
+ return s;
}
bool Input::is_detritus(std::string const& s) const
@@ -272,9 +274,9 @@
}
void Input::redintegrate_ex_post
- (int file_version
- ,std::map<std::string, std::string> detritus_map
- ,std::list<std::string> residuary_names
+ (int file_version
+ ,std::map<std::string, std::string> const& detritus_map
+ ,std::list<std::string> const& residuary_names
)
{
if(class_version() == file_version)
@@ -297,14 +299,14 @@
}
operator[]("AgentName" ) = full_name
- (detritus_map["AgentFirstName" ]
- ,detritus_map["AgentMiddleName"]
- ,detritus_map["AgentLastName" ]
+ (map_lookup(detritus_map, "AgentFirstName" )
+ ,map_lookup(detritus_map, "AgentMiddleName")
+ ,map_lookup(detritus_map, "AgentLastName" )
);
operator[]("InsuredName") = full_name
- (detritus_map["FirstName" ]
- ,detritus_map["MiddleName" ]
- ,detritus_map["LastName" ]
+ (map_lookup(detritus_map, "FirstName" )
+ ,map_lookup(detritus_map, "MiddleName" )
+ ,map_lookup(detritus_map, "LastName" )
);
}
Modified: lmi/trunk/ledger.hpp
===================================================================
--- lmi/trunk/ledger.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/ledger.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -109,8 +109,8 @@
void read (xml::element const&);
void write(xml::element&) const;
- int class_version() const;
- std::string xml_root_name() const;
+ int class_version() const;
+ std::string const& xml_root_name() const;
void write (std::ostream& os) const;
void write_xsl_fo(std::ostream& os) const;
Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/ledger_xml_io.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -994,9 +994,10 @@
return 0;
}
-std::string Ledger::xml_root_name() const
+std::string const& Ledger::xml_root_name() const
{
- return "illustration";
+ static std::string const s("illustration");
+ return s;
}
void Ledger::write(std::ostream& os) const
Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/mec_input.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -613,9 +613,10 @@
return 0;
}
-std::string mec_input::xml_root_name() const
+std::string const& mec_input::xml_root_name() const
{
- return "mec";
+ static std::string const s("mec");
+ return s;
}
bool mec_input::is_detritus(std::string const& s) const
Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/mec_input.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -102,8 +102,8 @@
void AscribeMembers();
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual bool is_detritus(std::string const&) const;
Modified: lmi/trunk/mec_state.cpp
===================================================================
--- lmi/trunk/mec_state.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/mec_state.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -392,9 +392,10 @@
return 0;
}
-std::string mec_state::xml_root_name() const
+std::string const& mec_state::xml_root_name() const
{
- return "mec_state";
+ static std::string const s("mec_state");
+ return s;
}
bool mec_state::is_detritus(std::string const& s) const
Modified: lmi/trunk/mec_state.hpp
===================================================================
--- lmi/trunk/mec_state.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/mec_state.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -68,8 +68,8 @@
void AscribeMembers();
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual bool is_detritus(std::string const&) const;
Modified: lmi/trunk/mec_xml_document.cpp
===================================================================
--- lmi/trunk/mec_xml_document.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/mec_xml_document.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -55,9 +55,10 @@
}
//============================================================================
-std::string mec_xml_document::xml_root_name() const
+std::string const& mec_xml_document::xml_root_name() const
{
- return "mec_xml_document";
+ static std::string const s("mec_xml_document");
+ return s;
}
//============================================================================
Modified: lmi/trunk/mec_xml_document.hpp
===================================================================
--- lmi/trunk/mec_xml_document.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/mec_xml_document.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -57,7 +57,7 @@
private:
void parse(xml::element const&);
- std::string xml_root_name() const;
+ std::string const& xml_root_name() const;
boost::scoped_ptr<mec_input> const input_data_;
};
Modified: lmi/trunk/multiple_cell_document.cpp
===================================================================
--- lmi/trunk/multiple_cell_document.cpp 2010-06-10 17:10:42 UTC (rev
4981)
+++ lmi/trunk/multiple_cell_document.cpp 2010-06-11 14:37:19 UTC (rev
4982)
@@ -59,9 +59,10 @@
}
//============================================================================
-std::string multiple_cell_document::xml_root_name() const
+std::string const& multiple_cell_document::xml_root_name() const
{
- return "multiple_cell_document";
+ static std::string const s("multiple_cell_document");
+ return s;
}
//============================================================================
Modified: lmi/trunk/multiple_cell_document.hpp
===================================================================
--- lmi/trunk/multiple_cell_document.hpp 2010-06-10 17:10:42 UTC (rev
4981)
+++ lmi/trunk/multiple_cell_document.hpp 2010-06-11 14:37:19 UTC (rev
4982)
@@ -59,7 +59,7 @@
private:
void parse(xml::element const&);
- std::string xml_root_name() const;
+ std::string const& xml_root_name() const;
// Default parameters for the whole case, stored as a vector for
// parallelism with class_parms_ and cell_parms_. Naturally, this
Modified: lmi/trunk/product_data.cpp
===================================================================
--- lmi/trunk/product_data.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/product_data.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -291,9 +291,10 @@
return 0;
}
-std::string product_data::xml_root_name() const
+std::string const& product_data::xml_root_name() const
{
- return "policy";
+ static std::string const s("policy");
+ return s;
}
/// This override doesn't call redintegrate_ex_ante(); that wouldn't
Modified: lmi/trunk/product_data.hpp
===================================================================
--- lmi/trunk/product_data.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/product_data.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -100,8 +100,8 @@
void ascribe_members();
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual void read_element
Modified: lmi/trunk/rounding_rules.cpp
===================================================================
--- lmi/trunk/rounding_rules.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/rounding_rules.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -243,9 +243,10 @@
return 0;
}
-std::string rounding_rules::xml_root_name() const
+std::string const& rounding_rules::xml_root_name() const
{
- return "rounding";
+ static std::string const s("rounding");
+ return s;
}
/// This override doesn't call redintegrate_ex_ante(); that wouldn't
Modified: lmi/trunk/rounding_rules.hpp
===================================================================
--- lmi/trunk/rounding_rules.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/rounding_rules.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -115,8 +115,8 @@
void ascribe_members();
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual void read_element
Modified: lmi/trunk/single_cell_document.cpp
===================================================================
--- lmi/trunk/single_cell_document.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/single_cell_document.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -64,9 +64,10 @@
}
//============================================================================
-std::string single_cell_document::xml_root_name() const
+std::string const& single_cell_document::xml_root_name() const
{
- return "single_cell_document";
+ static std::string const s("single_cell_document");
+ return s;
}
//============================================================================
Modified: lmi/trunk/single_cell_document.hpp
===================================================================
--- lmi/trunk/single_cell_document.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/single_cell_document.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -58,7 +58,7 @@
private:
void parse(xml::element const&);
- std::string xml_root_name() const;
+ std::string const& xml_root_name() const;
boost::scoped_ptr<Input> const input_data_;
};
Modified: lmi/trunk/stratified_charges.cpp
===================================================================
--- lmi/trunk/stratified_charges.cpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/stratified_charges.cpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -542,9 +542,10 @@
return 0;
}
-std::string stratified_charges::xml_root_name() const
+std::string const& stratified_charges::xml_root_name() const
{
- return "strata";
+ static std::string const s("strata");
+ return s;
}
/// This override doesn't call redintegrate_ex_ante(); that wouldn't
Modified: lmi/trunk/stratified_charges.hpp
===================================================================
--- lmi/trunk/stratified_charges.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/stratified_charges.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -162,8 +162,8 @@
stratified_entity& raw_entity(e_stratified);
// xml_serializable required implementation.
- virtual int class_version() const;
- virtual std::string xml_root_name() const;
+ virtual int class_version() const;
+ virtual std::string const& xml_root_name() const;
// xml_serializable overrides.
virtual void read_element
Modified: lmi/trunk/xml_serializable.hpp
===================================================================
--- lmi/trunk/xml_serializable.hpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/xml_serializable.hpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -58,8 +58,8 @@
void immit_members_into(xml::element&) const;
// Class (T) identification.
- virtual int class_version() const = 0;
- virtual std::string xml_root_name() const = 0;
+ virtual int class_version() const = 0;
+ virtual std::string const& xml_root_name() const = 0;
// Reading and writing.
virtual void read_element
@@ -80,9 +80,9 @@
,std::string & value
) const;
virtual void redintegrate_ex_post
- (int file_version
- ,std::map<std::string, std::string> detritus_map
- ,std::list<std::string> residuary_names
+ (int file_version
+ ,std::map<std::string, std::string> const& detritus_map
+ ,std::list<std::string> const& residuary_names
);
virtual void redintegrate_ad_terminum();
};
Modified: lmi/trunk/xml_serializable.tpp
===================================================================
--- lmi/trunk/xml_serializable.tpp 2010-06-10 17:10:42 UTC (rev 4981)
+++ lmi/trunk/xml_serializable.tpp 2010-06-11 14:37:19 UTC (rev 4982)
@@ -218,7 +218,7 @@
/// Root tag (when T is saved as the root of a document).
template<typename T>
-std::string xml_serializable<T>::xml_root_name() const
+std::string const& xml_serializable<T>::xml_root_name() const
{
throw "Unreachable--silences a compiler diagnostic.";
}
@@ -360,9 +360,9 @@
template<typename T>
void xml_serializable<T>::redintegrate_ex_post
- (int file_version
- ,std::map<std::string, std::string> // detritus_map
- ,std::list<std::string> // residuary_names
+ (int file_version
+ ,std::map<std::string, std::string> const& // detritus_map
+ ,std::list<std::string> const& // residuary_names
)
{
if(class_version() == file_version)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [4982] Improve const-correctness,
Greg Chicares <=