Use string instead of std::string

And others small code style touches.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2009-05-10 17:58:53 +01:00
parent 78eecbf6d7
commit 27619830d4
10 changed files with 85 additions and 92 deletions

View File

@@ -29,6 +29,7 @@
#include "material.h"
using std::string;
////
//// Local definitions
@@ -59,9 +60,9 @@ public:
EndgameScalingFunctionBase* getESF(Key key, Color* c) const;
private:
void add(const std::string& keyCode, EndgameEvaluationFunctionBase* f);
void add(const std::string& keyCode, Color c, EndgameScalingFunctionBase* f);
Key buildKey(const std::string& keyCode);
void add(const string& keyCode, EndgameEvaluationFunctionBase* f);
void add(const string& keyCode, Color c, EndgameScalingFunctionBase* f);
Key buildKey(const string& keyCode);
struct ScalingInfo
{
@@ -352,7 +353,7 @@ EndgameFunctions::EndgameFunctions() {
add("KRPKRPP", BLACK, &ScaleKRPKRPP);
}
Key EndgameFunctions::buildKey(const std::string& keyCode) {
Key EndgameFunctions::buildKey(const string& keyCode) {
assert(keyCode.length() > 0 && keyCode[0] == 'K');
assert(keyCode.length() < 8);
@@ -373,12 +374,12 @@ Key EndgameFunctions::buildKey(const std::string& keyCode) {
return Position(s.str()).get_material_key();
}
void EndgameFunctions::add(const std::string& keyCode, EndgameEvaluationFunctionBase* f) {
void EndgameFunctions::add(const string& keyCode, EndgameEvaluationFunctionBase* f) {
EEFmap.insert(std::pair<Key, EndgameEvaluationFunctionBase*>(buildKey(keyCode), f));
}
void EndgameFunctions::add(const std::string& keyCode, Color c, EndgameScalingFunctionBase* f) {
void EndgameFunctions::add(const string& keyCode, Color c, EndgameScalingFunctionBase* f) {
ScalingInfo s = {c, f};
ESFmap.insert(std::pair<Key, ScalingInfo>(buildKey(keyCode), s));