From e4dae008e90cb2b0143c0c98082bb156e49508e9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 9 Apr 2016 15:44:22 +0200 Subject: [PATCH] fix public/private keywords that snuck into declarations somehow --- renderdoc/driver/dxgi/dxgi_wrapped.h | 8 ++++---- renderdoc/driver/gl/gl_hooks_win32.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.h b/renderdoc/driver/dxgi/dxgi_wrapped.h index 896eebe09..91e64941b 100644 --- a/renderdoc/driver/dxgi/dxgi_wrapped.h +++ b/renderdoc/driver/dxgi/dxgi_wrapped.h @@ -364,7 +364,7 @@ public: virtual ~WrappedIDXGIDevice() { SAFE_RELEASE(m_pReal); SAFE_RELEASE(m_pD3DDevice); } - static const public int AllocPoolCount = 4; + static const int AllocPoolCount = 4; ALLOCATE_WITH_WRAPPED_POOL(WrappedIDXGIDevice, AllocPoolCount); IMPLEMENT_IDXGIOBJECT_WITH_REFCOUNTDXGIOBJECT_CUSTOMQUERY; @@ -543,7 +543,7 @@ public: RefCountDXGIObject(real), m_pReal(real), m_pD3DDevice(d3d) { m_pD3DDevice->AddRef(); } virtual ~WrappedIDXGIDevice1() { SAFE_RELEASE(m_pReal); SAFE_RELEASE(m_pD3DDevice); } - static const public int AllocPoolCount = 4; + static const int AllocPoolCount = 4; ALLOCATE_WITH_WRAPPED_POOL(WrappedIDXGIDevice1, AllocPoolCount); IMPLEMENT_IDXGIOBJECT_WITH_REFCOUNTDXGIOBJECT_CUSTOMQUERY; @@ -702,7 +702,7 @@ public: RefCountDXGIObject(real), m_pReal(real), m_pD3DDevice(d3d) { m_pD3DDevice->AddRef(); } virtual ~WrappedIDXGIDevice2() { SAFE_RELEASE(m_pReal); SAFE_RELEASE(m_pD3DDevice); } - static const public int AllocPoolCount = 4; + static const int AllocPoolCount = 4; ALLOCATE_WITH_WRAPPED_POOL(WrappedIDXGIDevice2, AllocPoolCount); IMPLEMENT_IDXGIOBJECT_WITH_REFCOUNTDXGIOBJECT_CUSTOMQUERY; @@ -814,7 +814,7 @@ public: RefCountDXGIObject(real), m_pReal(real), m_pD3DDevice(d3d) { m_pD3DDevice->AddRef(); } virtual ~WrappedIDXGIDevice3() { SAFE_RELEASE(m_pReal); SAFE_RELEASE(m_pD3DDevice); } - static const public int AllocPoolCount = 4; + static const int AllocPoolCount = 4; ALLOCATE_WITH_WRAPPED_POOL(WrappedIDXGIDevice3, AllocPoolCount); IMPLEMENT_IDXGIOBJECT_WITH_REFCOUNTDXGIOBJECT_CUSTOMQUERY; diff --git a/renderdoc/driver/gl/gl_hooks_win32.cpp b/renderdoc/driver/gl/gl_hooks_win32.cpp index 9ebd37758..0fdfe2ce8 100644 --- a/renderdoc/driver/gl/gl_hooks_win32.cpp +++ b/renderdoc/driver/gl/gl_hooks_win32.cpp @@ -326,7 +326,7 @@ class OpenGLHook : LibraryHook PFNWGLGETPIXELFORMATATTRIBFVARBPROC wglGetPixelFormatAttribfvARB_realfunc; PFNWGLGETPIXELFORMATATTRIBIVARBPROC wglGetPixelFormatAttribivARB_realfunc; - static private GLInitParams GetInitParamsForDC(HDC dc) + static GLInitParams GetInitParamsForDC(HDC dc) { GLInitParams ret;