From 3d592972dc3fd61cc88771b889eff237e4e03e0f Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 20 Oct 2020 19:07:39 -0700
Subject: Revert "core: Fix clang build"

---
 src/core/hle/service/bcat/backend/backend.h  | 8 ++++----
 src/core/hle/service/bcat/backend/boxcat.cpp | 9 ---------
 src/core/hle/service/bcat/module.cpp         | 3 +--
 3 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/core/hle/service/bcat')

diff --git a/src/core/hle/service/bcat/backend/backend.h b/src/core/hle/service/bcat/backend/backend.h
index 1e5e93290..48bbbe66f 100644
--- a/src/core/hle/service/bcat/backend/backend.h
+++ b/src/core/hle/service/bcat/backend/backend.h
@@ -53,10 +53,10 @@ struct DeliveryCacheProgressImpl {
     ResultCode result = RESULT_SUCCESS;
     DirectoryName current_directory;
     FileName current_file;
-    u64 current_downloaded_bytes; ///< Bytes downloaded on current file.
-    u64 current_total_bytes;      ///< Bytes total on current file.
-    u64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
-    u64 total_bytes;              ///< Bytes total on overall download.
+    s64 current_downloaded_bytes; ///< Bytes downloaded on current file.
+    s64 current_total_bytes;      ///< Bytes total on current file.
+    s64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
+    s64 total_bytes;              ///< Bytes total on overall download.
     INSERT_PADDING_BYTES(
         0x198); ///< Appears to be unused in official code, possibly reserved for future use.
 };
diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp
index e6cadf491..3b6f7498e 100644
--- a/src/core/hle/service/bcat/backend/boxcat.cpp
+++ b/src/core/hle/service/bcat/backend/boxcat.cpp
@@ -3,16 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <fmt/ostream.h>
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
 #include <httplib.h>
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
 #include <mbedtls/sha256.h>
 #include <nlohmann/json.hpp>
 #include "common/hex_util.h"
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp
index 5a7e9f930..db0e06ca1 100644
--- a/src/core/hle/service/bcat/module.cpp
+++ b/src/core/hle/service/bcat/module.cpp
@@ -454,8 +454,7 @@ private:
         write_size = std::min<u64>(write_size, files.size());
         std::vector<DeliveryCacheDirectoryEntry> entries(write_size);
         std::transform(
-            files.begin(), files.begin() + static_cast<s64>(write_size), entries.begin(),
-            [](const auto& file) {
+            files.begin(), files.begin() + write_size, entries.begin(), [](const auto& file) {
                 FileName name{};
                 std::memcpy(name.data(), file->GetName().data(),
                             std::min(file->GetName().size(), name.size()));
-- 
cgit v1.2.3