* Lets not go wild with templates.
This commit is contained in:
parent
4578a490ce
commit
ebfe57166d
1 changed files with 6 additions and 4 deletions
|
@ -26,9 +26,9 @@ static bool settingsRead = false;
|
||||||
static map<string, Strings> settings;
|
static map<string, Strings> settings;
|
||||||
|
|
||||||
|
|
||||||
template<class T, class A> A & genericAt(T & container, unsigned int n)
|
string & at(Strings & ss, unsigned int n)
|
||||||
{
|
{
|
||||||
class T::iterator i = container.begin();
|
Strings::iterator i =ss.begin();
|
||||||
advance(i, n);
|
advance(i, n);
|
||||||
return *i;
|
return *i;
|
||||||
}
|
}
|
||||||
|
@ -55,10 +55,10 @@ static void readSettings()
|
||||||
Strings tokens = tokenizeString(line);
|
Strings tokens = tokenizeString(line);
|
||||||
if (tokens.empty()) continue;
|
if (tokens.empty()) continue;
|
||||||
|
|
||||||
if (tokens.size() < 2 || genericAt<Strings, string>(tokens, 1) != "=")
|
if (tokens.size() < 2 || at(tokens, 1) != "=")
|
||||||
throw Error(format("illegal configuration line `%1%' in `%2%'") % line % settingsFile);
|
throw Error(format("illegal configuration line `%1%' in `%2%'") % line % settingsFile);
|
||||||
|
|
||||||
string name = genericAt<Strings, string>(tokens, 0);
|
string name = at(tokens, 0);
|
||||||
|
|
||||||
Strings::iterator i = tokens.begin();
|
Strings::iterator i = tokens.begin();
|
||||||
advance(i, 2);
|
advance(i, 2);
|
||||||
|
@ -79,6 +79,8 @@ Strings querySetting(const string & name, const Strings & def)
|
||||||
|
|
||||||
bool queryBoolSetting(const string & name, bool def)
|
bool queryBoolSetting(const string & name, bool def)
|
||||||
{
|
{
|
||||||
|
debug("X");
|
||||||
|
|
||||||
Strings defs;
|
Strings defs;
|
||||||
if (def) defs.push_back("true"); else defs.push_back("false");
|
if (def) defs.push_back("true"); else defs.push_back("false");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue