Quellcode durchsuchen

Fix warning-strict progression build

Millie vor 1 Woche
Ursprung
Commit
d9acdfbf34

+ 1 - 1
Sunrise/src/server/bap/encrypted/push/queuez/queuez_banner_push.cpp

@@ -104,7 +104,7 @@ void report_fail(const char* stage, const char* reason) noexcept {
 append_roster_appearance_frame(Scratch& scratch,
                                const queuez::RosterAppearanceRefresh& refresh,
                                snapshot::Prepared& prepared,
-                               const char* stage,
+                               [[maybe_unused]] const char* stage,
                                std::span<const std::byte, state::kAesKeySize> key,
                                std::array<std::byte, state::kBapNonceSize>& nonce,
                                std::span<std::byte> response,

+ 2 - 2
Sunrise/src/server/bap/encrypted/queuez/queuez_outcome_staging.cpp

@@ -268,7 +268,7 @@ bool stage_service_outcome(Scratch& scratch,
                              core::log::Level::warn,
                              "ev=queuez stage=equip_presentation result=fail");
         }
-        const auto presentationRows =
+        const auto equipmentPresentationRows =
             hasPresentation ? std::span(mergedPresentationRows).first(mergedPresentationRowCount)
                             : std::span<const AcquisitionPresentationRow>{};
         if (!valid(swap.after) || swap.characterSoid != pending.characterSoid
@@ -276,7 +276,7 @@ bool stage_service_outcome(Scratch& scratch,
             || before.family4Version == (std::numeric_limits<std::int32_t>::max)()
             || swap.after.family4Version != before.family4Version + 1
             || !push::append_equipment_swap_notification(
-                scratch, swap, pending, presentationRows, key, nonce, response, written)) {
+                scratch, swap, pending, equipmentPresentationRows, key, nonce, response, written)) {
             core::log::write(core::log::Channel::server,
                              core::log::Level::warn,
                              "ev=queuez stage=equip result=fail");

+ 4 - 3
Sunrise/src/state/progression/seasonal_experience.cpp

@@ -104,11 +104,12 @@ void load_locked() noexcept {
         != FALSE;
     (void)CloseHandle(file);
     std::int32_t restored = 0;
-    const bool current = sized && fileSize.QuadPart == document.size() && readable
-                         && read == document.size()
+    const bool current = sized && fileSize.QuadPart == static_cast<std::int64_t>(document.size())
+                         && readable && read == document.size()
                          && std::memcmp(document.data(), kMagic.data(), kMagic.size()) == 0;
     const bool legacy =
-        sized && fileSize.QuadPart == kLegacyDocumentSize && readable && read == kLegacyDocumentSize
+        sized && fileSize.QuadPart == static_cast<std::int64_t>(kLegacyDocumentSize) && readable
+        && read == kLegacyDocumentSize
         && std::memcmp(document.data(), kLegacyMagic.data(), kLegacyMagic.size()) == 0;
     if (!current && !legacy) {
         return;