1 --- einstein-2.0/convert.h~ 2005-08-14 04:40:58.000000000 +0200
2 +++ einstein-2.0/convert.h 2009-01-02 14:15:08.000000000 +0100
9 #include "exceptions.h"
11 --- einstein-2.0/unicode.cpp~ 2005-08-14 04:40:58.000000000 +0200
12 +++ einstein-2.0/unicode.cpp 2009-01-02 14:16:51.000000000 +0100
16 #include "exceptions.h"
20 /// Returns length of wide character in utf-8
21 --- einstein-2.0/formatter.cpp~ 2005-08-14 04:40:58.000000000 +0200
22 +++ einstein-2.0/formatter.cpp 2009-01-02 22:29:07.209885720 +0100
24 if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
25 (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
27 - int no = (int)c.data;
28 + long int no = (long int)c.data;
29 args[no - 1] = c.type;
33 std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
39 for (int i = 0; i < commandsCnt; i++) {
40 Command *cmd = &commands[i];
45 - no = (int)cmd->data - 1;
46 - if (no < (int)argValues.size())
47 + no = (long int)cmd->data - 1;
48 + if (no < (long int)argValues.size())
49 s += argValues[no]->format(cmd);