From 5413ed11955a5b8a09625b2df1c28fb18c99c296 Mon Sep 17 00:00:00 2001 From: KodexKy Date: Mon, 3 Nov 2014 16:55:37 -0430 Subject: Fixes for Android build errors. Enable sensor landscape rotation. Fix typo in Android Makefile ndk path. Fix touchscreen parts of game.cpp to work after Zeno's refactor. Fix isdigit and isspace overload conflict with Android Irrlicht in string.h Enable sensor landscape rotation in Android Manifiest. Add mapgen v5 to Android build. Fix Makefile not checking leveldb. Signed-off-by: Craig Robbins --- src/util/string.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/util') diff --git a/src/util/string.h b/src/util/string.h index f4337062e..52ef8c164 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -212,11 +212,11 @@ inline std::string trim(const std::string &s) { size_t front = 0; - while (isspace(s[front])) + while (std::isspace(s[front])) ++front; size_t back = s.size(); - while (back > front && isspace(s[back-1])) + while (back > front && std::isspace(s[back-1])) --back; return s.substr(front, back - front); @@ -481,7 +481,7 @@ inline std::string unescape_string(std::string &s) inline bool is_number(const std::string &tocheck) { for (size_t i = 0; i < tocheck.size(); i++) - if (!isdigit(tocheck[i])) + if (!std::isdigit(tocheck[i])) return false; return !tocheck.empty(); -- cgit v1.2.3