From 4e0ca8fea873443c634945c018c55ade3fff400e Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Wed, 5 Jun 2019 17:42:35 +0300
Subject: [PATCH] More warning fixes
---
components/net/cpp/include/ftl/net/universe.hpp | 2 +-
components/net/cpp/include/ftl/uuid.hpp | 1 +
components/net/cpp/src/universe.cpp | 6 +++---
components/net/cpp/test/peer_unit.cpp | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/components/net/cpp/include/ftl/net/universe.hpp b/components/net/cpp/include/ftl/net/universe.hpp
index 11ebcfdf5..169eff589 100644
--- a/components/net/cpp/include/ftl/net/universe.hpp
+++ b/components/net/cpp/include/ftl/net/universe.hpp
@@ -59,7 +59,7 @@ class Universe : public ftl::Configurable {
*/
Peer *connect(const std::string &addr);
- int numberOfPeers() const { return peers_.size(); }
+ size_t numberOfPeers() const { return peers_.size(); }
int waitConnections();
diff --git a/components/net/cpp/include/ftl/uuid.hpp b/components/net/cpp/include/ftl/uuid.hpp
index c7c884e5d..5d494b8dd 100644
--- a/components/net/cpp/include/ftl/uuid.hpp
+++ b/components/net/cpp/include/ftl/uuid.hpp
@@ -56,6 +56,7 @@ namespace ftl {
if (::UuidToStringA(&guid_, &szUuid) == RPC_S_OK) {
return std::string((char*)szUuid);
}
+ return "00000000-0000-0000-0000-000000000000";
#else
char b[37];
uuid_unparse(uuid_, b);
diff --git a/components/net/cpp/src/universe.cpp b/components/net/cpp/src/universe.cpp
index 55ab9b0a5..85733459c 100644
--- a/components/net/cpp/src/universe.cpp
+++ b/components/net/cpp/src/universe.cpp
@@ -106,7 +106,7 @@ int Universe::_setDescriptors() {
FD_ZERO(&sfdread_);
FD_ZERO(&sfderror_);
- int n = 0;
+ SOCKET n = 0;
unique_lock<mutex> lk(net_mutex_);
@@ -193,7 +193,7 @@ bool Universe::createResource(const std::string &uri) {
int Universe::numberOfSubscribers(const std::string &res) const {
auto s = subscribers_.find(res);
if (s != subscribers_.end()) {
- return s->second.size();
+ return (int)s->second.size();
} else {
return -1;
}
@@ -276,7 +276,7 @@ void Universe::_run() {
sockaddr_storage addr;
//Finally accept this client connection.
- int csock = accept(l->_socket(), (sockaddr*)&addr, (socklen_t*)&rsize);
+ SOCKET csock = accept(l->_socket(), (sockaddr*)&addr, (socklen_t*)&rsize);
if (csock != INVALID_SOCKET) {
auto p = new Peer(csock, &disp_);
diff --git a/components/net/cpp/test/peer_unit.cpp b/components/net/cpp/test/peer_unit.cpp
index dd780cbc4..d9a67fdb2 100644
--- a/components/net/cpp/test/peer_unit.cpp
+++ b/components/net/cpp/test/peer_unit.cpp
@@ -40,7 +40,7 @@ class MockPeer : public Peer {
// --- Support -----------------------------------------------------------------
-static std::map<int, std::string> fakedata;
+static std::map<SOCKET, std::string> fakedata;
#ifdef WIN32
int ftl::net::internal::recv(SOCKET sd, char *buf, int n, int f) {
@@ -52,7 +52,7 @@ ssize_t ftl::net::internal::recv(SOCKET sd, void *buf, size_t n, int f) {
return 0;
}
- int l = fakedata[sd].size();
+ size_t l = fakedata[sd].size();
std::memcpy(buf, fakedata[sd].c_str(), l);
fakedata.erase(sd);
--
GitLab