X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftinygettext%2Ftinygettext.cpp;h=ffaaf710da3c97c1271039980d99abb2e8ccfb43;hb=03df70be85c3e209c122cae3d28aad614590f709;hp=2946f7f32950aecc0b5115fbe5ccd1d1ae25e360;hpb=69ea60f8f8897e7eaade225e693ecb8dad8fddab;p=supertux.git diff --git a/src/tinygettext/tinygettext.cpp b/src/tinygettext/tinygettext.cpp index 2946f7f32..ffaaf710d 100644 --- a/src/tinygettext/tinygettext.cpp +++ b/src/tinygettext/tinygettext.cpp @@ -31,7 +31,6 @@ #include "tinygettext.hpp" #include "log.hpp" #include "physfs/physfs_stream.hpp" -#include "log.hpp" #include "findlocale.hpp" //#define TRANSLATION_DEBUG @@ -224,7 +223,7 @@ DictionaryManager::parseLocaleAliases() char c = ' '; while(in.good() && !in.eof()) { - while(isspace(c) && !in.eof()) + while(isspace(static_cast(c)) && !in.eof()) in.get(c); if(c == '#') { // skip comments @@ -234,14 +233,14 @@ DictionaryManager::parseLocaleAliases() } std::string alias; - while(!isspace(c) && !in.eof()) { + while(!isspace(static_cast(c)) && !in.eof()) { alias += c; in.get(c); } - while(isspace(c) && !in.eof()) + while(isspace(static_cast(c)) && !in.eof()) in.get(c); std::string language; - while(!isspace(c) && !in.eof()) { + while(!isspace(static_cast(c)) && !in.eof()) { language += c; in.get(c); } @@ -719,7 +718,7 @@ public: do { // Read keyword token.keyword += c; - } while((c = getchar(in)) != EOF && !isspace(c)); + } while((c = getchar(in)) != EOF && !isspace(static_cast(c))); in.unget(); state = READ_CONTENT; @@ -733,7 +732,7 @@ public: // Found start of content state = READ_CONTENT_IN_STRING; break; - } else if (isspace(c)) { + } else if (isspace(static_cast(c))) { // skip } else { // Read something that may be a keyword in.unget();