Retire struct OptionsMap

Directly use the underlying std::map instead and avoid
a useless inheritance.

As a nice side-effect Options global object has now a
default c'tor avoiding possible issues with globals
initializations.

Suggested by Rein Halbersma.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2012-08-18 11:23:18 +01:00
parent bc4de9edae
commit b011818917
3 changed files with 16 additions and 19 deletions

View File

@@ -49,15 +49,14 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const
}
/// OptionsMap c'tor initializes the UCI options to their hard coded default
/// UCIOptions::init() initializes the UCI options to their hard coded default
/// values and initializes the default value of "Threads" and "Min Split Depth"
/// parameters according to the number of CPU cores detected.
OptionsMap::OptionsMap() {
void UCIOptions::init(OptionsMap& o) {
int cpus = std::min(cpu_count(), MAX_THREADS);
int msd = cpus < 8 ? 4 : 7;
OptionsMap& o = *this;
o["Use Debug Log"] = UCIOption(false, on_logger);
o["Use Search Log"] = UCIOption(false);