research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix AnyMap compilation issues with some compilers

Browse source 
Some versions of G++ complained about being unable to decide between the const
and non-const functions. Rewriting without the use of the deprecated
std::mem_fun is the simplest fix.
This commit is contained in:
Ray Speth 2019-01-15 18:02:04 -05:00
parent e7c6495ec7
commit fb1054a259
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/cantera/base/AnyMap.h
View file

@ -339,10 +339,6 @@ public:
void applyUnits(const UnitSystem& units);
private:
template <class T>
const T& get(const std::string& key, const T& default_,
std::function<const T&(const AnyValue*)> getter) const;
std::unordered_map<std::string, AnyValue> m_data;
UnitSystem m_units;

22
src/base/AnyMap.cpp
View file

@ -627,39 +627,25 @@ std::string AnyMap::keys_str() const
return to_string(b);
}
template<class T>
const T& AnyMap::get(const std::string& key, const T& default_,
std::function<const T&(const AnyValue*)> getter) const
{
if (m_data.find(key) != m_data.end()) {
return getter(&m_data.at(key));
} else {
return default_;
}
}
bool AnyMap::getBool(const std::string& key, bool default_) const
{
return get<bool>(key, default_,
std::mem_fun<const bool&, const AnyValue>(&AnyValue::asBool));
return (hasKey(key)) ? m_data.at(key).asBool() : default_;
}
double AnyMap::getDouble(const std::string& key, double default_) const
{
return get<double>(key, default_,
std::mem_fun<const double&, const AnyValue>(&AnyValue::asDouble));
return (hasKey(key)) ? m_data.at(key).asDouble() : default_;
}
long int AnyMap::getInt(const std::string& key, long int default_) const
{
return get<long int>(key, default_,
std::mem_fun<const long int&, const AnyValue>(&AnyValue::asInt));
return (hasKey(key)) ? m_data.at(key).asInt() : default_;
}
const std::string& AnyMap::getString(const std::string& key,
const std::string& default_) const
{
return get<std::string>(key, default_, &AnyValue::asString);
return (hasKey(key)) ? m_data.at(key).asString() : default_;
}
double AnyMap::convert(const std::string& key, const std::string& dest) const