aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-10-13 15:42:33 +0000
committerJohannes Schickel2010-10-13 15:42:33 +0000
commit1769b520aaf066bb8298c8e2f9d089fb69cf0c02 (patch)
tree8fde867084b2c7d5c6c0bd16347b8ccde17097a2
parenta2b96a2516cd87203b22f7496a8d5a6b65749da3 (diff)
downloadscummvm-rg350-1769b520aaf066bb8298c8e2f9d089fb69cf0c02.tar.gz
scummvm-rg350-1769b520aaf066bb8298c8e2f9d089fb69cf0c02.tar.bz2
scummvm-rg350-1769b520aaf066bb8298c8e2f9d089fb69cf0c02.zip
OPENGL: Cleanup.
svn-id: r53434
-rw-r--r--backends/events/sdl/sdl-events.h2
-rw-r--r--backends/modular-backend.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index 2c00ab0669..b060d021fc 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -37,7 +37,7 @@
/**
* The SDL event source.
*/
-class SdlEventSource : public virtual Common::EventSource {
+class SdlEventSource : public Common::EventSource {
public:
SdlEventSource();
virtual ~SdlEventSource();
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index ed638fe303..5b031880ed 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -52,7 +52,7 @@
* And, it should also initialize all the managers variables
* declared in this class, or override their related functions.
*/
-class ModularBackend : public OSystem, public virtual Common::EventSource {
+class ModularBackend : public OSystem {
public:
ModularBackend();
virtual ~ModularBackend();