diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2016-04-05 20:10:11 -0400 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2016-04-05 20:10:11 -0400 |
| commit | aa6380e5bc9c3b40e53c001e76838819d61ca62a (patch) | |
| tree | 22d8a5dc94874820d5bd7a8964485153db234672 /src/video_core/renderer_base.cpp | |
| parent | b39340849631f565cf5c32bfdbab9fdc0bd4db9d (diff) | |
| parent | a06dcfeb61d6769c562d6d50cfa3c0024176ae82 (diff) | |
Merge pull request #1643 from MerryMage/make_unique
Common: Remove Common::make_unique, use std::make_unique
Diffstat (limited to 'src/video_core/renderer_base.cpp')
| -rw-r--r-- | src/video_core/renderer_base.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp index 6467ff723..101f84eb9 100644 --- a/src/video_core/renderer_base.cpp +++ b/src/video_core/renderer_base.cpp @@ -4,8 +4,6 @@ #include <memory> -#include "common/make_unique.h" - #include "core/settings.h" #include "video_core/renderer_base.h" @@ -19,9 +17,9 @@ void RendererBase::RefreshRasterizerSetting() { opengl_rasterizer_active = hw_renderer_enabled; if (hw_renderer_enabled) { - rasterizer = Common::make_unique<RasterizerOpenGL>(); + rasterizer = std::make_unique<RasterizerOpenGL>(); } else { - rasterizer = Common::make_unique<VideoCore::SWRasterizer>(); + rasterizer = std::make_unique<VideoCore::SWRasterizer>(); } rasterizer->InitObjects(); rasterizer->Reset(); |
