[Scummvm-cvs-logs] scummvm master -> 7a3df4681b3b399f58585b204b66b582ee17c163

criezy criezy at scummvm.org
Sun Feb 19 19:43:03 CET 2012


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

Summary:
f6b8fec0f1 NULL: Fix compiler error when using NullMutexManager
7a3df4681b NULL: Fix compiler errors when using the NullGraphicsManager


Commit: f6b8fec0f13c739bf48c5b0c01647245fdeaa962
    https://github.com/scummvm/scummvm/commit/f6b8fec0f13c739bf48c5b0c01647245fdeaa962
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-02-19T10:38:28-08:00

Commit Message:
NULL: Fix compiler error when using NullMutexManager

The compiler error fixed (when trying to set the _mutexManager) is:
error: ‘MutexManager’ is an inaccessible base of ‘NullMutexManager’

Changed paths:
    backends/mutex/null/null-mutex.h



diff --git a/backends/mutex/null/null-mutex.h b/backends/mutex/null/null-mutex.h
index fdb32b2..7ae10ce 100644
--- a/backends/mutex/null/null-mutex.h
+++ b/backends/mutex/null/null-mutex.h
@@ -28,7 +28,7 @@
 /**
  * Null mutex manager
  */
-class NullMutexManager : MutexManager {
+class NullMutexManager : public MutexManager {
 public:
 	virtual OSystem::MutexRef createMutex() { return OSystem::MutexRef(); }
 	virtual void lockMutex(OSystem::MutexRef mutex) {}


Commit: 7a3df4681b3b399f58585b204b66b582ee17c163
    https://github.com/scummvm/scummvm/commit/7a3df4681b3b399f58585b204b66b582ee17c163
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-02-19T10:41:49-08:00

Commit Message:
NULL: Fix compiler errors when using the NullGraphicsManager

The errors fixed are inaccessible base class when trying to set the
_graphicsManager and a pure virtual function when trying to create
the NullGraphicsManager instance.

Changed paths:
    backends/graphics/null/null-graphics.h



diff --git a/backends/graphics/null/null-graphics.h b/backends/graphics/null/null-graphics.h
index 28b24f6..2e6b24d 100644
--- a/backends/graphics/null/null-graphics.h
+++ b/backends/graphics/null/null-graphics.h
@@ -27,7 +27,7 @@
 
 static const OSystem::GraphicsMode s_noGraphicsModes[] = { {0, 0, 0} };
 
-class NullGraphicsManager : GraphicsManager {
+class NullGraphicsManager : public GraphicsManager {
 public:
 	virtual ~NullGraphicsManager() {}
 
@@ -38,6 +38,7 @@ public:
 	const OSystem::GraphicsMode *getSupportedGraphicsModes() const { return s_noGraphicsModes; }
 	int getDefaultGraphicsMode() const { return 0; }
 	bool setGraphicsMode(int mode) { return true; }
+	void resetGraphicsScale(){}
 	int getGraphicsMode() const { return 0; }
 	inline Graphics::PixelFormat getScreenFormat() const {
 		return Graphics::PixelFormat::createFormatCLUT8();






More information about the Scummvm-git-logs mailing list