Skip to content

Commit

Permalink
Type mismatch on a 64bit platforms has been fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
ws233 committed Jul 26, 2015
1 parent 5dfb0cb commit 0146185
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ccutil/genericvector.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ccutil/helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit 0146185

Please sign in to comment.