cpp/openttd-patchpack/source Changeset - r14429:d459d2cbce62

Changeset - r14429:d459d2cbce62

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-02-03 21:45:48
rubidium@openttd.org

(svn r18996) -Fix (r18993, r18994): MSVC 64 bits had somethings to complain about

3 files changed with 5 insertions and 5 deletions:

src/core/smallvec_type.hpp

src/network/core/tcp_http.cpp

src/network/network_content.cpp

0 comments (0 inline, 0 general)

src/core/smallvec_type.hpp

➞

Show inline comments

@@ @@ -79,9 +79,9 @@ public: @@
 	 * @param to_add the number of items to append
 	 * @return pointer to newly allocated item
 	 */
-	FORCEINLINE T *Append(size_t to_add = 1)
+	FORCEINLINE T *Append(uint to_add = 1)
+	{
-		size_t begin = this->items;
+		uint begin = this->items;
 		this->items += to_add;
 		if (this->items > this->capacity) {

src/network/core/tcp_http.cpp

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ NetworkHTTPSocketHandler::NetworkHTTPSoc @@
 	redirect_depth(depth),
 	sock(s)
+{
-	int bufferSize = strlen(url) + strlen(host) + strlen(_openttd_revision) + (data == NULL ? 0 : strlen(data)) + 128;
+	size_t bufferSize = strlen(url) + strlen(host) + strlen(_openttd_revision) + (data == NULL ? 0 : strlen(data)) + 128;
 	char *buffer = AllocaM(char, bufferSize);
 	DEBUG(net, 7, "[tcp/http] requesting %s%s", host, url);

src/network/network_content.cpp

➞

Show inline comments

@@ @@ -511,7 +511,7 @@ void ClientNetworkContentSocketHandler:: @@
 	if (this->http_response_index == -1) {
 		if (data != NULL) {
 			/* Append the rest of the response. */
 			memcpy(this->http_response.Append(length), data, length);
+			memcpy(this->http_response.Append((uint)length), data, length);
 			return;
 		} else {
 			/* Make sure the response is properly terminated. */
@@ @@ -563,7 +563,7 @@ void ClientNetworkContentSocketHandler:: @@
 		check_and_terminate(p);
 		/* Update the index for the next one */
 		this->http_response_index += strlen(str) + 1;
+		this->http_response_index += (int)strlen(str) + 1;
 		/* Read the ID */
 		p = strchr(str, ',');

0 comments (0 inline, 0 general)