Mercurial > hg > openttd
changeset 9916:fa925e28f10e draft
(svn r14069) -Fix: silence MSVC 64-bits compile warnings.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 13 Aug 2008 14:52:54 +0000 |
| parents | f0cea4aa2bf6 |
| children | e9de0ed93866 |
| files | src/fileio.cpp src/misc_gui.cpp src/querystring_gui.h |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -367,12 +367,12 @@ strcpy(resolved_name, filename); strtolower(resolved_name); - uint resolved_len = strlen(resolved_name); + size_t resolved_len = strlen(resolved_name); /* Resolve ONE directory link */ for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) { const std::string &src = link->first; - uint len = src.length(); + size_t len = src.length(); if (resolved_len >= len && resolved_name[len - 1] == PATHSEPCHAR && strncmp(src.c_str(), resolved_name, len) == 0) { /* Apply link */ char resolved_name2[MAX_RESOLVED_LENGTH];
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1056,7 +1056,7 @@ struct QueryStringWindow : public QueryStringBaseWindow { - QueryStringWindow(size_t size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc) + QueryStringWindow(uint16 size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc) { this->parent = parent; SetBit(_no_scroll, SCROLL_EDIT);
--- a/src/querystring_gui.h +++ b/src/querystring_gui.h @@ -39,11 +39,11 @@ }; struct QueryStringBaseWindow : public Window, public QueryString { - const size_t edit_str_size; char *edit_str_buf; char *orig_str_buf; + const uint16 edit_str_size; - QueryStringBaseWindow(size_t size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size) + QueryStringBaseWindow(uint16 size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size) { this->edit_str_buf = CallocT<char>(size); }