[Scummvm-cvs-logs] scummvm master -> 4d75aa5319479f0c260c08dcbdf945dde41887ce

digitall dgturner at iee.org
Fri Nov 23 21:46:22 CET 2012


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:
4d75aa5319 COMPOSER: Fix order of directoryGlobs qualifiers.


Commit: 4d75aa5319479f0c260c08dcbdf945dde41887ce
    https://github.com/scummvm/scummvm/commit/4d75aa5319479f0c260c08dcbdf945dde41887ce
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-23T12:44:17-08:00

Commit Message:
COMPOSER: Fix order of directoryGlobs qualifiers.

Some compilers throw a warning on the "const static" ordering, so
the more standard "static const" should be used instead.

Changed paths:
    engines/composer/detection.cpp



diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 835f3c5..8411441 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -374,7 +374,7 @@ static const ComposerGameDescription gameDescriptions[] = {
 using namespace Composer;
 
 // we match from data too, to stop detection from a non-top-level directory
-const static char *directoryGlobs[] = {
+static const char *directoryGlobs[] = {
 	"data",
 	"liam",
 	"programs",






More information about the Scummvm-git-logs mailing list