cpp/openttd-patchpack/source Changeset - r9916:dfe4035b061f

Changeset - r9916:dfe4035b061f

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-08-13 14:52:54
rubidium@openttd.org

(svn r14069) -Fix: silence MSVC 64-bits compile warnings.

3 files changed with 5 insertions and 5 deletions:

src/fileio.cpp

src/misc_gui.cpp

src/querystring_gui.h

0 comments (0 inline, 0 general)

src/fileio.cpp

➞

Show inline comments

@@ @@ -364,18 +364,18 @@ FILE *FioFOpenFile(const char *filename, @@
 		char resolved_name[MAX_RESOLVED_LENGTH];
 		/* Filenames in tars are always forced to be lowercase */
 		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];
 				const std::string &dest = link->second;
 				strcpy(resolved_name2, &(resolved_name[len]));
 				strcpy(resolved_name, dest.c_str());

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -1053,13 +1053,13 @@ enum QueryStringWidgets { @@
 	QUERY_STR_WIDGET_OK
 };
 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);
 		this->FindWindowPlacementAndResize(desc);
+	}

src/querystring_gui.h

➞

Show inline comments

@@ @@ -36,17 +36,17 @@ struct QueryString { @@
 	void DrawEditBox(Window *w, int wid);
 	void HandleEditBox(Window *w, int wid);
 	int HandleEditBoxKey(Window *w, int wid, uint16 key, uint16 keycode, Window::EventState &state);
 };
 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);
+	}
 	~QueryStringBaseWindow()
+	{

0 comments (0 inline, 0 general)