Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKissaki <kissaki@gmx.de>2013-04-24 23:41:18 +0400
committerKissaki <kissaki@gmx.de>2013-06-05 00:38:00 +0400
commitf4c54b24e378906ec15e438bf3a1bd75b8e4ee6c (patch)
tree42220c5e59a8775546e932fdd35cd84db1579f5c /overlay
parent7cff8ca5d8415a54c9ec6b9e30e68fc498e4b738 (diff)
Explicitly mark childmethods as virtual
* Mark the childmethods overwriting the virtual Pipe methods as virtual explicitly (effectively already were)
Diffstat (limited to 'overlay')
-rw-r--r--overlay/d3d10.cpp8
-rw-r--r--overlay/d3d9.cpp6
-rw-r--r--overlay/opengl.cpp6
3 files changed, 10 insertions, 10 deletions
diff --git a/overlay/d3d10.cpp b/overlay/d3d10.cpp
index 34e0f5ed4..e0463cee1 100644
--- a/overlay/d3d10.cpp
+++ b/overlay/d3d10.cpp
@@ -94,13 +94,13 @@ class D10State: protected Pipe {
unsigned int frameCount;
D10State(IDXGISwapChain *, ID3D10Device *);
- ~D10State();
+ virtual ~D10State();
void init();
void draw();
- void blit(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
- void setRect();
- void newTexture(unsigned int w, unsigned int h);
+ virtual void blit(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+ virtual void setRect();
+ virtual void newTexture(unsigned int w, unsigned int h);
};
map<IDXGISwapChain *, D10State *> chains;
diff --git a/overlay/d3d9.cpp b/overlay/d3d9.cpp
index 5f2303308..f132cc66f 100644
--- a/overlay/d3d9.cpp
+++ b/overlay/d3d9.cpp
@@ -68,9 +68,9 @@ class DevState : public Pipe {
void draw();
void postDraw();
- void blit(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
- void setRect();
- void newTexture(unsigned int width, unsigned int height);
+ virtual void blit(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+ virtual void setRect();
+ virtual void newTexture(unsigned int width, unsigned int height);
};
static map<IDirect3DDevice9 *, DevState *> devMap;
diff --git a/overlay/opengl.cpp b/overlay/opengl.cpp
index f3fdd7c5b..9f8208430 100644
--- a/overlay/opengl.cpp
+++ b/overlay/opengl.cpp
@@ -143,9 +143,9 @@ class Context : protected Pipe {
Context(HDC hdc);
void draw(HDC hdc);
- void blit(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
- void setRect();
- void newTexture(unsigned int width, unsigned int height);
+ virtual void blit(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+ virtual void setRect();
+ virtual void newTexture(unsigned int width, unsigned int height);
};
Context::Context(HDC hdc) {