summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-11-03 08:34:30 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2015-11-03 08:34:30 -0500
commitc04358fbe28a80fa462dce1ff71c02820f87bd29 (patch)
tree3b0191c0c9017a96070f63e67e645c7bcb2c27de /Source/Core/VideoBackends
parent3de1ec384aabf43286a5335c8092cdb51bdd648c (diff)
parenta656c05be29f22d39013d42ea4b06c944db15cea (diff)
Merge pull request #3222 from Tilka/vertexmanagerbase
VideoCommon: rename VertexManager to VertexManagerBase
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/VertexManager.h2
-rw-r--r--Source/Core/VideoBackends/OGL/VertexManager.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h
index 4b54a138bb..d963f81266 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.h
+++ b/Source/Core/VideoBackends/D3D/VertexManager.h
@@ -9,7 +9,7 @@
namespace DX11
{
-class VertexManager : public ::VertexManager
+class VertexManager : public VertexManagerBase
{
public:
VertexManager();
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h
index 0d6a1c00c6..11d7e69e48 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.h
+++ b/Source/Core/VideoBackends/OGL/VertexManager.h
@@ -26,7 +26,7 @@ namespace OGL
// Handles the OpenGL details of drawing lots of vertices quickly.
// Other functionality is moving out.
-class VertexManager : public ::VertexManager
+class VertexManager : public VertexManagerBase
{
public:
VertexManager();