diff options
| author |  David Marcec | 2018-04-26 14:28:54 -0700 |
|---|---|---|
| committer | David Marcec | 2018-04-26 14:28:54 -0700 |
| commit | 7391741a204d6f25a06132eda214b2199b60a084 (patch) | |
| tree | aeeb723744c4563ad608361b82dd938b062a3e09 /src/core/loader/linker.cpp | |
| parent | Added PREPO to logging backend, Removed comments from SaveReportWithUser (diff) | |
| parent | Merge pull request #403 from lioncash/common (diff) | |
| download | yuzu-7391741a204d6f25a06132eda214b2199b60a084.tar.gz yuzu-7391741a204d6f25a06132eda214b2199b60a084.tar.xz yuzu-7391741a204d6f25a06132eda214b2199b60a084.zip | |
Merge branch 'master' of https://github.com/yuzu-emu/yuzu into service-impl
Diffstat (limited to 'src/core/loader/linker.cpp')
| -rw-r--r-- | src/core/loader/linker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/linker.cpp b/src/core/loader/linker.cpp index 69198e3e3..c7be5f265 100644 --- a/src/core/loader/linker.cpp +++ b/src/core/loader/linker.cpp | |||
| @@ -84,7 +84,7 @@ void Linker::WriteRelocations(std::vector<u8>& program_image, const std::vector< | |||
| 84 | } | 84 | } |
| 85 | break; | 85 | break; |
| 86 | default: | 86 | default: |
| 87 | LOG_CRITICAL(Loader, "Unknown relocation type: %d", static_cast<int>(rela.type)); | 87 | NGLOG_CRITICAL(Loader, "Unknown relocation type: {}", static_cast<int>(rela.type)); |
| 88 | break; | 88 | break; |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| @@ -141,7 +141,7 @@ void Linker::ResolveImports() { | |||
| 141 | if (search != exports.end()) { | 141 | if (search != exports.end()) { |
| 142 | Memory::Write64(import.second.ea, search->second + import.second.addend); | 142 | Memory::Write64(import.second.ea, search->second + import.second.addend); |
| 143 | } else { | 143 | } else { |
| 144 | LOG_ERROR(Loader, "Unresolved import: %s", import.first.c_str()); | 144 | NGLOG_ERROR(Loader, "Unresolved import: {}", import.first); |
| 145 | } | 145 | } |
| 146 | } | 146 | } |
| 147 | } | 147 | } |