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/core/file_sys/archive_savedata.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/core/file_sys/archive_savedata.cpp')
| -rw-r--r-- | src/core/file_sys/archive_savedata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index fe020d21c..fd5711e14 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -3,11 +3,11 @@ // Refer to the license.txt file included. #include <algorithm> +#include <memory> #include "common/common_types.h" #include "common/file_util.h" #include "common/logging/log.h" -#include "common/make_unique.h" #include "common/string_util.h" #include "core/file_sys/archive_savedata.h" @@ -53,7 +53,7 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveData::Open(const P ErrorSummary::InvalidState, ErrorLevel::Status); } - auto archive = Common::make_unique<DiskArchive>(std::move(concrete_mount_point)); + auto archive = std::make_unique<DiskArchive>(std::move(concrete_mount_point)); return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive)); } |