ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixmeup use

This commit is contained in:
Tillmann Karras 2014-05-11 10:37:08 +02:00
parent 4400e511c0
commit fd94ce5210
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Boot/Boot_WiiWAD.cpp
View File

@ -8,6 +8,7 @@
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Common/StdMakeUnique.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/PatchEngine.h" #include "Core/PatchEngine.h"
@ -98,11 +99,11 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename)
std::unique_ptr<CDolLoader> pDolLoader; std::unique_ptr<CDolLoader> pDolLoader;
if (pContent->m_pData) if (pContent->m_pData)
{ {
pDolLoader.reset(new CDolLoader(pContent->m_pData, pContent->m_Size)); pDolLoader = std::make_unique<CDolLoader>(pContent->m_pData, pContent->m_Size);
} }
else else
{ {
pDolLoader.reset(new CDolLoader(pContent->m_Filename)); pDolLoader = std::make_unique<CDolLoader>(pContent->m_Filename);
} }
pDolLoader->Load(); pDolLoader->Load();
PC = pDolLoader->GetEntryPoint() | 0x80000000; PC = pDolLoader->GetEntryPoint() | 0x80000000;

5
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
View File

@ -42,6 +42,7 @@
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Common/StdMakeUnique.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
@ -918,11 +919,11 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
std::unique_ptr<CDolLoader> pDolLoader; std::unique_ptr<CDolLoader> pDolLoader;
if (pContent->m_pData) if (pContent->m_pData)
{ {
pDolLoader.reset(new CDolLoader(pContent->m_pData, pContent->m_Size)); pDolLoader = std::make_unique<CDolLoader>(pContent->m_pData, pContent->m_Size);
} }
else else
{ {
pDolLoader.reset(new CDolLoader(pContent->m_Filename)); pDolLoader = std::make_unique<CDolLoader>(pContent->m_Filename);
} }
pDolLoader->Load(); // TODO: Check why sysmenu does not load the DOL correctly pDolLoader->Load(); // TODO: Check why sysmenu does not load the DOL correctly
PC = pDolLoader->GetEntryPoint() | 0x80000000; PC = pDolLoader->GetEntryPoint() | 0x80000000;

3
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -8,6 +8,7 @@
#include <memory> #include <memory>
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/StdMakeUnique.h"
#include "Core/PatchEngine.h" #include "Core/PatchEngine.h"
#include "Core/HLE/HLE.h" #include "Core/HLE/HLE.h"
#include "Core/PowerPC/Profiler.h" #include "Core/PowerPC/Profiler.h"
@ -223,7 +224,7 @@ namespace JitILProfiler
std::unique_ptr<JitILProfilerFinalizer> finalizer; std::unique_ptr<JitILProfilerFinalizer> finalizer;
static void Init() static void Init()
{ {
finalizer.reset(new JitILProfilerFinalizer()); finalizer = std::make_unique<JitILProfilerFinalizer>();
} }
static void Shutdown() static void Shutdown()
{ {

3
Source/Core/Core/PowerPC/JitILCommon/IR.cpp
View File

@ -125,6 +125,7 @@ TODO (in no particular order):
#include <memory> #include <memory>
#include <set> #include <set>
#include "Common/StdMakeUnique.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/HW/GPFifo.h" #include "Core/HW/GPFifo.h"
@ -1280,7 +1281,7 @@ void IRBuilder::WriteToFile(u64 codeHash) {
_assert_(sizeof(opcodeNames) / sizeof(opcodeNames[0]) == Int3 + 1); _assert_(sizeof(opcodeNames) / sizeof(opcodeNames[0]) == Int3 + 1);
if (!writer.get()) { if (!writer.get()) {
writer.reset(new Writer()); writer = std::make_unique<Writer>();
} }
FILE* const file = writer->file.GetHandle(); FILE* const file = writer->file.GetHandle();