From 52415a8e8f7c924c2f9a50e268d012fcd8cb65a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 4 Mar 2021 13:45:45 -0500
Subject: [PATCH] misc: clean some build warnings
Change-Id: I2f3b0a6e36d3e57a10a8fa0e83ff812cfbcc3181
---
src/dring/CMakeLists.txt | 1 +
src/ice_transport.cpp | 2 +-
src/jamidht/account_manager.h | 2 +-
src/manager.h | 11 ++++++-----
src/meson.build | 1 +
src/peer_connection.h | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/dring/CMakeLists.txt b/src/dring/CMakeLists.txt
index d0badbe31c..ece134194d 100644
--- a/src/dring/CMakeLists.txt
+++ b/src/dring/CMakeLists.txt
@@ -7,6 +7,7 @@ list (APPEND Source_Files__dring
"${CMAKE_CURRENT_SOURCE_DIR}/callmanager_interface.h"
"${CMAKE_CURRENT_SOURCE_DIR}/plugin_manager_interface.h"
"${CMAKE_CURRENT_SOURCE_DIR}/configurationmanager_interface.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/conversation_interface.h"
"${CMAKE_CURRENT_SOURCE_DIR}/datatransfer_interface.h"
"${CMAKE_CURRENT_SOURCE_DIR}/dring.h"
"${CMAKE_CURRENT_SOURCE_DIR}/media_const.h"
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 3497579e62..409b858f03 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -1510,7 +1510,7 @@ IceTransport::send(int comp_id, const unsigned char* buf, size_t len)
// bytes length).
std::unique_lock<std::mutex> lk(pimpl_->iceMutex_);
pimpl_->waitDataCv_.wait(lk, [&] {
- return pimpl_->lastSentLen_ >= static_cast<pj_ssize_t>(len)
+ return pimpl_->lastSentLen_ >= static_cast<pj_size_t>(len)
or pimpl_->destroying_.load();
});
pimpl_->lastSentLen_ = 0;
diff --git a/src/jamidht/account_manager.h b/src/jamidht/account_manager.h
index 945f916f42..6d9bb8df71 100644
--- a/src/jamidht/account_manager.h
+++ b/src/jamidht/account_manager.h
@@ -31,8 +31,8 @@
#include <opendht/crypto.h>
#include <functional>
-#include <string>
#include <map>
+#include <string>
namespace dht {
class DhtRunner;
diff --git a/src/manager.h b/src/manager.h
index 98ec468633..8daf9b722f 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -37,13 +37,14 @@
#include "audio/audiolayer.h"
#include "scheduled_executor.h"
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
+#include <algorithm>
#include <atomic>
#include <functional>
-#include <algorithm>
+#include <map>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
namespace asio {
class io_context;
diff --git a/src/meson.build b/src/meson.build
index 959cf469cc..4a975487ed 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -314,6 +314,7 @@ if get_option('interfaces').contains('library')
'dring/callmanager_interface.h',
'dring/configurationmanager_interface.h',
'dring/datatransfer_interface.h',
+ 'dring/conversation_interface.h',
'dring/def.h',
'dring/dring.h',
'dring/media_const.h',
diff --git a/src/peer_connection.h b/src/peer_connection.h
index d46b6d1c9c..d390515412 100644
--- a/src/peer_connection.h
+++ b/src/peer_connection.h
@@ -69,7 +69,7 @@ public:
// Not implemented
}
- virtual void setOnStateChangedCb(const OnStateChangedCb& cb) {}
+ virtual void setOnStateChangedCb(const OnStateChangedCb&) {}
};
//==============================================================================
--
GitLab