benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GCC 4.7 compilation fixes

Browse source 
clarify binding of function (by specifying 'this')
This commit is contained in:
Michael Fisher 2012-08-13 12:08:18 -05:00 committed by Ichthyostega
parent 954ebefc4c
commit e267e0ad0b
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/query/fake-configrules.hpp
View file

@ -143,7 +143,7 @@ namespace lumiera {
virtual bool
resolve (Ret& solution, Query<TY> const& q)
{
const any& entry = fetch_from_table_for (q.asKey());
const any& entry = this->fetch_from_table_for (q.asKey());
if (!isnil (entry))
{
Ret const& candidate (any_cast<Ret const&> (entry));
@ -166,7 +166,7 @@ namespace lumiera {
if (is_defaults_query (newQuery)) // modified query..
return solution = Session::current->defaults (newQuery);
// may cause recursion
if (detect_case (solution, newQuery))
if (this->detect_case (solution, newQuery))
return resolve (solution, newQuery);
return solution = Ret(); // fail: return default-constructed empty smart ptr

28
src/lib/format-util.hpp
View file

@ -102,8 +102,20 @@ namespace util {
}//(End) guards/helpers
/** @return a string denoting the type. */
template<typename TY>
inline string
tyStr (const TY* =0)
{
return string("«")+typeid(TY).name()+"»";
}
template<typename TY>
inline string
tyStr (TY const& ref)
{ return tyStr(&ref); }
/** try to get an object converted to string.
* A custom/standard conversion to string is used,
* if applicable; otherwise, some standard types can be
@ -126,21 +138,5 @@ namespace util {
: tyStr(val);
}
/** @return a string denoting the type. */
template<typename TY>
inline string
tyStr (const TY* =0)
{
return string("«")+typeid(TY).name()+"»";
}
template<typename TY>
inline string
tyStr (TY const& ref)
{ return tyStr(&ref); }
} // namespace util
#endif