[Scummvm-cvs-logs] scummvm-tools master -> e35cf725acfff64d785f02ac6c6807b73d9f7ec9

[criezy]

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

Summary:
e35cf725ac TOOLS: Work around a deque constructor not usable with CC


Commit: e35cf725acfff64d785f02ac6c6807b73d9f7ec9
    https://github.com/scummvm/scummvm-tools/commit/e35cf725acfff64d785f02ac6c6807b73d9f7ec9
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-07-01T14:36:59-07:00

Commit Message:
TOOLS: Work around a deque constructor not usable with CC

The patch was provided by Laurent Blume (patch #3614504).

Changed paths:
    scummvm-tools-cli.cpp



diff --git a/scummvm-tools-cli.cpp b/scummvm-tools-cli.cpp
index d25248b..85dcae7 100644
--- a/scummvm-tools-cli.cpp
+++ b/scummvm-tools-cli.cpp
@@ -40,8 +40,13 @@ int ToolsCLI::run(int argc, char *argv[]) {
 		return 2;
 	}
 
+// If using Solaris Studio
+#if defined(__sun) && !defined(__GNUC__)
+	std::deque<std::string> arguments; for (int i = 1; i < argc; i++) arguments.push_back(argv[i]);
+#else
 	std::deque<std::string> arguments(argv, argv + argc);
 	arguments.pop_front(); // Pop our own name
+#endif
 
 	ToolType type = TOOLTYPE_ALL;