Fix some compile-time issues on gcc-13 on mingw64

Got some warnings about amiguous calls. Fixed.
cculianu · Nov 9, 2023 · 74338ba · 74338ba
1 parent ee10d5c
commit 74338ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Servers.cpp b/src/Servers.cpp
@@ -1560,7 +1560,7 @@ void Server::impl_get_first_use(Client *c, const RPC::BatchId batchId, const RPC
             // note that we are implementing this the way Electrs does, which throws an error here rather than
             // returning null for unknown scripthash and/or address.
             const auto msg = addr.isEmpty()
-                                 ? QString("scripthash %1 not found").arg(Util::ToHexFast(scriptHash))
+                                 ? QString("scripthash %1 not found").arg(QString::fromLatin1(Util::ToHexFast(scriptHash)))
                                  : QString("address %1 not found").arg(addr);
             throw RPCError(msg, RPC::ErrorCodes::Code_ItemNotFound);
         }

diff --git a/src/SubStatus.h b/src/SubStatus.h
@@ -76,6 +76,7 @@ class SubStatus {
     SubStatus(const DSProof &od) { var.emplace<DSP>(od); }
     SubStatus(DSProof &&od) { var.emplace<DSP>(std::move(od)); }
     SubStatus(const std::optional<BlockHeight> &obh) noexcept { this->operator=(obh); }
+    SubStatus(BlockHeight bh) noexcept : var{static_cast<BH>(bh)} {}
 
     SubStatus &operator=(const SubStatus &o) = default;
     SubStatus &operator=(SubStatus && o) = default;