Merge pull request #65 from ws233/master

Type mismatch on 64bit platforms
This commit is contained in:
zdenop 2015-10-28 20:02:20 +01:00
commit b882590491
2 changed files with 2 additions and 2 deletions

View File

@ -361,7 +361,7 @@ inline bool LoadDataFromFile(const STRING& filename,
size_t size = ftell(fp);
fseek(fp, 0, SEEK_SET);
// Pad with a 0, just in case we treat the result as a string.
data->init_to_size(size + 1, 0);
data->init_to_size((int)size + 1, 0);
bool result = fread(&(*data)[0], 1, size, fp) == size;
fclose(fp);
return result;

View File

@ -73,7 +73,7 @@ class TRand {
// Remove newline (if any) at the end of the string.
inline void chomp_string(char *str) {
int last_index = strlen(str) - 1;
int last_index = (int)strlen(str) - 1;
while (last_index >= 0 &&
(str[last_index] == '\n' || str[last_index] == '\r')) {
str[last_index--] = '\0';