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

@@ -25,7 +25,15 @@
#include <map>
#include <string>
struct OptionsMap;
class UCIOption;
/// Custom comparator because UCI options should be case insensitive
struct CaseInsensitiveLess {
bool operator() (const std::string&, const std::string&) const;
};
/// Our options container is actually a std::map
typedef std::map<std::string, UCIOption, CaseInsensitiveLess> OptionsMap;
/// UCIOption class implements an option as defined by UCI protocol
class UCIOption {
@@ -59,19 +67,8 @@ private:
Fn* on_change;
};
/// Custom comparator because UCI options should be case insensitive
struct CaseInsensitiveLess {
bool operator() (const std::string&, const std::string&) const;
};
/// Our options container is actually a map with a customized c'tor
struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
OptionsMap();
};
extern std::ostream& operator<<(std::ostream&, const OptionsMap&);
extern OptionsMap Options;
namespace UCIOptions { void init(OptionsMap&); }
#endif // !defined(UCIOPTION_H_INCLUDED)