summaryrefslogtreecommitdiff
path: root/src/core/hle/service/filesystem
diff options
context:
space:
mode:
authorGravatar bunnei2020-10-20 19:07:39 -0700
committerGravatar GitHub2020-10-20 19:07:39 -0700
commit3d592972dc3fd61cc88771b889eff237e4e03e0f (patch)
tree0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/core/hle/service/filesystem
parentkernel: Fix build with recent compiler flag changes (diff)
downloadyuzu-3d592972dc3fd61cc88771b889eff237e4e03e0f.tar.gz
yuzu-3d592972dc3fd61cc88771b889eff237e4e03e0f.tar.xz
yuzu-3d592972dc3fd61cc88771b889eff237e4e03e0f.zip
Revert "core: Fix clang build"
Diffstat (limited to 'src/core/hle/service/filesystem')
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 993686f1d..649128be4 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -94,8 +94,7 @@ private:
94 } 94 }
95 95
96 // Read the data from the Storage backend 96 // Read the data from the Storage backend
97 const auto output = backend->ReadBytes(static_cast<u64>(length), static_cast<u64>(offset)); 97 std::vector<u8> output = backend->ReadBytes(length, offset);
98
99 // Write the data to memory 98 // Write the data to memory
100 ctx.WriteBuffer(output); 99 ctx.WriteBuffer(output);
101 100
@@ -152,7 +151,7 @@ private:
152 } 151 }
153 152
154 // Read the data from the Storage backend 153 // Read the data from the Storage backend
155 const auto output = backend->ReadBytes(static_cast<u64>(length), static_cast<u64>(offset)); 154 std::vector<u8> output = backend->ReadBytes(length, offset);
156 155
157 // Write the data to memory 156 // Write the data to memory
158 ctx.WriteBuffer(output); 157 ctx.WriteBuffer(output);
@@ -195,8 +194,7 @@ private:
195 // Write the data to the Storage backend 194 // Write the data to the Storage backend
196 const auto write_size = 195 const auto write_size =
197 static_cast<std::size_t>(std::distance(data.begin(), data.begin() + length)); 196 static_cast<std::size_t>(std::distance(data.begin(), data.begin() + length));
198 const std::size_t written = 197 const std::size_t written = backend->Write(data.data(), write_size, offset);
199 backend->Write(data.data(), write_size, static_cast<u64>(offset));
200 198
201 ASSERT_MSG(static_cast<s64>(written) == length, 199 ASSERT_MSG(static_cast<s64>(written) == length,
202 "Could not write all bytes to file (requested={:016X}, actual={:016X}).", length, 200 "Could not write all bytes to file (requested={:016X}, actual={:016X}).", length,