From 66ac49aa1cbb2381501782c9f08ca3a6276e10b2 Mon Sep 17 00:00:00 2001 From: James-Mart Date: Thu, 5 Sep 2024 15:57:53 +0000 Subject: [PATCH 1/3] silence warning - missing return --- libraries/net/include/psibase/blocknet.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/net/include/psibase/blocknet.hpp b/libraries/net/include/psibase/blocknet.hpp index f1857cbc9..18a71f82c 100644 --- a/libraries/net/include/psibase/blocknet.hpp +++ b/libraries/net/include/psibase/blocknet.hpp @@ -202,6 +202,9 @@ namespace psibase::net } } assert(!"Unknown peer connection"); + + // Silence warning + return *std::make_unique(0); } void disconnect(peer_id id) From 079d0d656bf7ac98b8a5eb91c9c64d6654bd1a24 Mon Sep 17 00:00:00 2001 From: James-Mart Date: Thu, 5 Sep 2024 15:58:22 +0000 Subject: [PATCH 2/3] silence warning - specify field designators in declaration order --- services/user/Nft/src/Nft.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/user/Nft/src/Nft.cpp b/services/user/Nft/src/Nft.cpp index 346858dfe..91895c154 100644 --- a/services/user/Nft/src/Nft.cpp +++ b/services/user/Nft/src/Nft.cpp @@ -340,14 +340,14 @@ struct NftQuery return NftDetail { .id = nft->id, + .owner = UserDetail{ + .account = nft->owner, + .authService = owner->authService, + }, .issuer = UserDetail{ .account = nft->issuer, .authService = issuer->authService, }, - .owner = UserDetail{ - .account = nft->owner, - .authService = owner->authService, - } }; // clang-format on } From 702eb41629743977c7b4f4f17704fca2bae59c5b Mon Sep 17 00:00:00 2001 From: James-Mart Date: Tue, 10 Sep 2024 19:45:27 +0000 Subject: [PATCH 3/3] pr feedback - prefer __builtin_unreachable to an unreachable return statement --- libraries/net/include/psibase/blocknet.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/net/include/psibase/blocknet.hpp b/libraries/net/include/psibase/blocknet.hpp index 18a71f82c..4db6eb0be 100644 --- a/libraries/net/include/psibase/blocknet.hpp +++ b/libraries/net/include/psibase/blocknet.hpp @@ -202,9 +202,7 @@ namespace psibase::net } } assert(!"Unknown peer connection"); - - // Silence warning - return *std::make_unique(0); + __builtin_unreachable(); } void disconnect(peer_id id)