[Scummvm-cvs-logs] scummvm master -> 90788da0fc74472593bceee4f0a1549e925c8e73

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
90788da0fc QUEEN: Workaround a bug in the llvm-g++ compiler


Commit: 90788da0fc74472593bceee4f0a1549e925c8e73
    https://github.com/scummvm/scummvm/commit/90788da0fc74472593bceee4f0a1549e925c8e73
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-12-02T14:57:15-08:00

Commit Message:
QUEEN: Workaround a bug in the llvm-g++ compiler

That code made llvm-g++ 4.2.1 crash when compiling with
optimizations.

Changed paths:
    engines/queen/journal.cpp



diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp
index 7040196..db06d54 100644
--- a/engines/queen/journal.cpp
+++ b/engines/queen/journal.cpp
@@ -400,7 +400,7 @@ static void removeLeadingAndTrailingSpaces(char *dst, size_t dstSize, const char
 	while (src[lastNonSpaceIndex] == ' ')
 		--lastNonSpaceIndex;
 
-	size_t newLen = lastNonSpaceIndex - firstNonSpaceIndex + 1;
+	uint newLen = lastNonSpaceIndex - firstNonSpaceIndex + 1;
 	assert(newLen < dstSize);
 	for (size_t i = 0; i < newLen; ++i) {
 		dst[i] = src[firstNonSpaceIndex + i];