diff --git a/src/common/query/fake-configrules.hpp b/src/common/query/fake-configrules.hpp index 80ec54f74..37b7d8d07 100644 --- a/src/common/query/fake-configrules.hpp +++ b/src/common/query/fake-configrules.hpp @@ -143,7 +143,7 @@ namespace lumiera { virtual bool resolve (Ret& solution, Query 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 (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 diff --git a/src/lib/format-util.hpp b/src/lib/format-util.hpp index c5f1b76e8..c060299f7 100644 --- a/src/lib/format-util.hpp +++ b/src/lib/format-util.hpp @@ -102,8 +102,20 @@ namespace util { }//(End) guards/helpers + /** @return a string denoting the type. */ + template + inline string + tyStr (const TY* =0) + { + return string("«")+typeid(TY).name()+"»"; + } + template + 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 - inline string - tyStr (const TY* =0) - { - return string("«")+typeid(TY).name()+"»"; - } - - template - inline string - tyStr (TY const& ref) - { return tyStr(&ref); } - - } // namespace util #endif