From f47ef5e644f585bf31f1b3934cbdfeb65c00c6bb Mon Sep 17 00:00:00 2001 From: gabest11 Date: Tue, 8 Nov 2011 13:22:54 +0000 Subject: [PATCH] GSdx: as usual, going back to msvc, suddenly wild errors appear. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4964 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/GSdx/GS.cpp | 2 +- plugins/GSdx/GSRendererHW.h | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 891936d73f..f3ccaf104b 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -553,7 +553,7 @@ EXPORT_C GSirqCallback(void (*irq)()) } } -void pt(char* str){ +void pt(const char* str){ struct tm *current; time_t now; diff --git a/plugins/GSdx/GSRendererHW.h b/plugins/GSdx/GSRendererHW.h index 61a9e035a9..b183a70407 100644 --- a/plugins/GSdx/GSRendererHW.h +++ b/plugins/GSdx/GSRendererHW.h @@ -30,14 +30,7 @@ template class GSRendererHW : public GSRendererT { - int m_width; - int m_height; - int m_skip; - bool m_reset; - bool m_nativeres; - int m_upscale_multiplier; - int m_userhacks_skipdraw; - +protected: using GSRendererT::m_vt; using GSRendererT::m_count; using GSRendererT::m_env; @@ -55,6 +48,15 @@ class GSRendererHW : public GSRendererT using GSRendererT::s_savez; using GSRendererT::s_n; +private: + int m_width; + int m_height; + int m_skip; + bool m_reset; + bool m_nativeres; + int m_upscale_multiplier; + int m_userhacks_skipdraw; + #pragma region hacks typedef bool (GSRendererHW::*OI_Ptr)(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);