diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-04-27 18:29:51 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-27 18:29:51 -0400 |
| commit | a48c6b947d5314ab804f375cca22af159cc3b77b (patch) | |
| tree | 5f49ac6edc39d37c9b49514217957b47e73505f2 /src/video_core | |
| parent | 451a14f98c4d881208c786a6a5aa621e2647aed5 (diff) | |
removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable class
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_base.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index bc65bf0c..2650620b 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -6,7 +6,7 @@ #include "common/common.h" -class RendererBase { +class RendererBase : NonCopyable { public: /// Used to reference a framebuffer @@ -52,6 +52,4 @@ protected: f32 m_current_fps; ///< Current framerate, should be set by the renderer int m_current_frame; ///< Current frame, should be set by the renderer -private: - DISALLOW_COPY_AND_ASSIGN(RendererBase); }; diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 676a0ea0..4c0b6e59 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -87,5 +87,4 @@ private: u8 m_xfb_top_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4]; u8 m_xfb_bottom_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4]; - DISALLOW_COPY_AND_ASSIGN(RendererOpenGL); };
\ No newline at end of file |