From f64376cbc134f701caefb92cd837dd020badf803 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 20 Sep 2017 12:49:17 +0200
Subject: [PATCH] fix(Conference): add override when necessary and cast
 correctly nb participants

---
 src/chat/client-group-chat-room.h  | 10 +++++-----
 src/conference/conference.cpp      |  2 +-
 src/conference/remote-conference.h | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/chat/client-group-chat-room.h b/src/chat/client-group-chat-room.h
index 1dcc1cc47..5dacb98f2 100644
--- a/src/chat/client-group-chat-room.h
+++ b/src/chat/client-group-chat-room.h
@@ -51,11 +51,11 @@ public:
 
 private:
 	/* ConferenceListener */
-	void onConferenceCreated (const Address &addr);
-	void onConferenceTerminated (const Address &addr);
-	void onParticipantAdded (const Address &addr);
-	void onParticipantRemoved (const Address &addr);
-	void onParticipantSetAdmin (const Address &addr, bool isAdmin);
+	void onConferenceCreated (const Address &addr) override;
+	void onConferenceTerminated (const Address &addr) override;
+	void onParticipantAdded (const Address &addr) override;
+	void onParticipantRemoved (const Address &addr) override;
+	void onParticipantSetAdmin (const Address &addr, bool isAdmin) override;
 
 private:
 	L_DECLARE_PRIVATE(ClientGroupChatRoom);
diff --git a/src/conference/conference.cpp b/src/conference/conference.cpp
index ba165dbbc..4a40d509c 100644
--- a/src/conference/conference.cpp
+++ b/src/conference/conference.cpp
@@ -59,7 +59,7 @@ const string& Conference::getId () const {
 }
 
 int Conference::getNbParticipants () const {
-	return participants.size();
+	return static_cast<int>(participants.size());
 }
 
 list<shared_ptr<Participant>> Conference::getParticipants () const {
diff --git a/src/conference/remote-conference.h b/src/conference/remote-conference.h
index c8cb28d6c..c49f44c0b 100644
--- a/src/conference/remote-conference.h
+++ b/src/conference/remote-conference.h
@@ -36,16 +36,16 @@ protected:
 
 public:
 	/* ConferenceInterface */
-	virtual std::shared_ptr<Participant> addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia);
-	virtual void removeParticipant (const std::shared_ptr<const Participant> &participant);
+	virtual std::shared_ptr<Participant> addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override;
+	virtual void removeParticipant (const std::shared_ptr<const Participant> &participant) override;
 
 protected:
 	/* ConferenceListener */
-	virtual void onConferenceCreated (const Address &addr);
-	virtual void onConferenceTerminated (const Address &addr);
-	virtual void onParticipantAdded (const Address &addr);
-	virtual void onParticipantRemoved (const Address &addr);
-	virtual void onParticipantSetAdmin (const Address &addr, bool isAdmin);
+	virtual void onConferenceCreated (const Address &addr) override;
+	virtual void onConferenceTerminated (const Address &addr) override;
+	virtual void onParticipantAdded (const Address &addr) override;
+	virtual void onParticipantRemoved (const Address &addr) override;
+	virtual void onParticipantSetAdmin (const Address &addr, bool isAdmin) override;
 
 private:
 	L_DISABLE_COPY(RemoteConference);