Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Common: Remove Common::make_unique, use std::make_unique

Browse source
This commit is contained in:
MerryMage 2016-04-05 13:29:55 +01:00
parent b83e95727f
commit a06dcfeb61
24 changed files with 46 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/citra/config.cpp
View file

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <memory>
#include <inih/cpp/INIReader.h>
#include <SDL.h>
@ -10,7 +12,6 @@
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/make_unique.h"
#include "core/settings.h"
@ -19,7 +20,7 @@
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini";
sdl2_config = Common::make_unique<INIReader>(sdl2_config_loc);
sdl2_config = std::make_unique<INIReader>(sdl2_config_loc);
Reload();
}
@ -31,7 +32,7 @@ bool Config::LoadINI(const std::string& default_contents, bool retry) {
LOG_WARNING(Config, "Failed to load %s. Creating file from defaults...", location);
FileUtil::CreateFullPath(location);
FileUtil::WriteStringToFile(true, default_contents, location);
sdl2_config = Common::make_unique<INIReader>(location); // Reopen file
sdl2_config = std::make_unique<INIReader>(location); // Reopen file
return LoadINI(default_contents, false);
}