--- ../orig/einstein-2.0/formatter.cpp 2005-08-14 04:40:58.000000000 +0200 +++ formatter.cpp 2007-08-31 08:42:16.000000000 +0200 @@ -58,7 +58,7 @@ if ((c.type == INT_ARG) || (c.type == STRING_ARG) || (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG)) { - int no = (int)c.data; + long no = (long)c.data; args[no - 1] = c.type; } } @@ -123,7 +123,7 @@ std::wstring Formatter::format(std::vector &argValues) const { std::wstring s; - int no; + long no; for (int i = 0; i < commandsCnt; i++) { Command *cmd = &commands[i]; @@ -135,8 +135,8 @@ case STRING_ARG: case INT_ARG: - no = (int)cmd->data - 1; - if (no < (int)argValues.size()) + no = (long)cmd->data - 1; + if (no < (long)argValues.size()) s += argValues[no]->format(cmd); break;