[Scummvm-cvs-logs] scummvm master -> 991d5364be542b54c5dc62be1a75cacf635c39f6

[lordhoto]

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:
991d5364be COMMON: Add a space between a string literal and a macro parameter so C++11 does not think the latter is a string litera


Commit: 991d5364be542b54c5dc62be1a75cacf635c39f6
    https://github.com/scummvm/scummvm/commit/991d5364be542b54c5dc62be1a75cacf635c39f6
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2012-03-17T12:03:53-07:00

Commit Message:
COMMON: Add a space between a string literal and a macro parameter so C++11 does not think the latter is a string literal suffix.

Changed paths:
    base/commandLine.cpp



diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 0883816..d877c58 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -277,12 +277,12 @@ void registerDefaults() {
 // Use this for boolean options; this distinguishes between "-x" and "-X",
 // resp. between "--some-option" and "--no-some-option".
 #define DO_OPTION_BOOL(shortCmd, longCmd) \
-	if (isLongCmd ? (!strcmp(s+2, longCmd) || !strcmp(s+2, "no-"longCmd)) : (tolower(s[1]) == shortCmd)) { \
+	if (isLongCmd ? (!strcmp(s+2, longCmd) || !strcmp(s+2, "no-" longCmd)) : (tolower(s[1]) == shortCmd)) { \
 		bool boolValue = (Common::isLower(s[1]) != 0); \
 		s += 2; \
 		if (isLongCmd) { \
 			boolValue = !strcmp(s, longCmd); \
-			s += boolValue ? (sizeof(longCmd) - 1) : (sizeof("no-"longCmd) - 1); \
+			s += boolValue ? (sizeof(longCmd) - 1) : (sizeof("no-" longCmd) - 1); \
 		} \
 		if (*s != '\0') goto unknownOption; \
 		const char *option = boolValue ? "true" : "false"; \