[Scummvm-cvs-logs] scummvm master -> 642e0baacbe0ec24dff1871350d808b5c7beba16

[eriktorbjorn]

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:
642e0baacb GUI: Silence GCC warning


Commit: 642e0baacbe0ec24dff1871350d808b5c7beba16
    https://github.com/scummvm/scummvm/commit/642e0baacbe0ec24dff1871350d808b5c7beba16
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-09-19T11:10:46-07:00

Commit Message:
GUI: Silence GCC warning

Rename local variable 'buffer' to keep it from clashing with the
buffer() method.

Changed paths:
    gui/console.cpp



diff --git a/gui/console.cpp b/gui/console.cpp
index bfce04c..dc2c5c4 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -665,11 +665,11 @@ int ConsoleDialog::printFormat(int dummy, const char *format, ...) {
 }
 
 int ConsoleDialog::vprintFormat(int dummy, const char *format, va_list argptr) {
-	Common::String buffer = Common::String::vformat(format, argptr);
+	Common::String buf = Common::String::vformat(format, argptr);
 
-	print(buffer.c_str());
+	print(buf.c_str());
 
-	return buffer.size();
+	return buf.size();
 }
 
 void ConsoleDialog::printChar(int c) {