mirror of
https://github.com/sockspls/badfish
synced 2025-05-01 09:13:08 +00:00
Fix compilation with Android NDK
It seems ADL lookup is broken with the STLPort library. Peter says: The compiler is gcc 4.4.3, but I don't know how many patches they have applied to it. I think gcc has had support for Koenig lookup a long time. I think the problem is the type of the vector iterator. For example, line 272 in search.cpp: if (bookMove && count(RootMoves.begin(), RootMoves.end(), bookMove)) gives the error: jni/stockfish/search.cpp:272: error: 'count' was not declared in this scope Here RootMoves is: std::vector<RootMove> RootMoves; If std::vector<T>::iterator is implemented as T*, then Koenig lookup would fail because RootMove* is not in namespace std. I compile with the stlport implementation of STL, which in its vector class has: typedef value_type* iterator; I'm not sure if this is allowed by the C++ standard. I did not find anything that says the iterator type must belong to namespace std. The consensus in this thread http://compgroups.net/comp.lang.c++.moderated/argument-dependent-lookup/433395 is that the stlport iterator type is allowed. Report and patch by Peter Osterlund. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
2f47844c7c
commit
caef319219
4 changed files with 8 additions and 2 deletions
|
@ -72,7 +72,7 @@ namespace {
|
||||||
string sides[] = { code.substr(code.find('K', 1)), // Weaker
|
string sides[] = { code.substr(code.find('K', 1)), // Weaker
|
||||||
code.substr(0, code.find('K', 1)) }; // Stronger
|
code.substr(0, code.find('K', 1)) }; // Stronger
|
||||||
|
|
||||||
transform(sides[c].begin(), sides[c].end(), sides[c].begin(), tolower);
|
std::transform(sides[c].begin(), sides[c].end(), sides[c].begin(), tolower);
|
||||||
|
|
||||||
string fen = sides[0] + char('0' + int(8 - code.length()))
|
string fen = sides[0] + char('0' + int(8 - code.length()))
|
||||||
+ sides[1] + "/8/8/8/8/8/8/8 w - - 0 10";
|
+ sides[1] + "/8/8/8/8/8/8/8 w - - 0 10";
|
||||||
|
|
|
@ -51,6 +51,11 @@ using std::endl;
|
||||||
using Eval::evaluate;
|
using Eval::evaluate;
|
||||||
using namespace Search;
|
using namespace Search;
|
||||||
|
|
||||||
|
// For some reason argument-dependent lookup (ADL) doesn't work for Android's
|
||||||
|
// STLPort, so explicitly qualify following functions.
|
||||||
|
using std::count;
|
||||||
|
using std::find;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
// Set to true to force running with one thread. Used for debugging
|
// Set to true to force running with one thread. Used for debugging
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
/// | only in 64-bit mode. For compiling requires hardware with
|
/// | only in 64-bit mode. For compiling requires hardware with
|
||||||
/// | popcnt support.
|
/// | popcnt support.
|
||||||
|
|
||||||
|
#include <cctype>
|
||||||
#include <climits>
|
#include <climits>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
|
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
|
||||||
return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
|
return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue