[Scummvm-cvs-logs] scummvm master -> e963f8bc6098c93b3b3d39d46fa7617a1567f6ef

eriktorbjorn eriktorbjorn at telia.com
Sun May 29 21:35:54 CEST 2016


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:
e963f8bc60 SHERLOCK: Silence very noisy GCC warning


Commit: e963f8bc6098c93b3b3d39d46fa7617a1567f6ef
    https://github.com/scummvm/scummvm/commit/e963f8bc6098c93b3b3d39d46fa7617a1567f6ef
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-05-29T21:35:37+02:00

Commit Message:
SHERLOCK: Silence very noisy GCC warning

Since 'w' and 'h' are members of ManagedSurface, using them as
input parameters to a method caused GCC to warn about them being
shadowed. For just about every file in the Sherlock engine...

Changed paths:
    engines/sherlock/surface.h



diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 807fbeb..401d9b6 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -121,7 +121,7 @@ protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
 public:
 	Surface() : BaseSurface() {}
-	Surface(int w, int h) : BaseSurface(w, h) {}
+	Surface(int width, int height) : BaseSurface(width, height) {}
 };
 
 } // End of namespace Sherlock






More information about the Scummvm-git-logs mailing list