mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(core): remove useless include, virtual... And add required virtual on some classes (add a -Wdelete-non-virtual-dtor warning on clang)

Browse source
This commit is contained in:
Ronan Abhamon 2018-03-07 17:17:18 +01:00
parent 18d0c4ad20
commit 21a5f1c001
9 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -284,7 +284,7 @@ else()
list(APPEND STRICT_OPTIONS_C "-fno-inline-small-functions")
endif()
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
list(APPEND STRICT_OPTIONS_CPP "-Qunused-arguments" "-Wno-array-bounds")
list(APPEND STRICT_OPTIONS_CPP "-Qunused-arguments" "-Wno-array-bounds -Wdelete-non-virtual-dtor")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
list(APPEND STRICT_OPTIONS_CXX "-x c++")

2
src/call/call-p.h
View file

@ -38,8 +38,6 @@ class RealTimeTextChatRoom;
class CallPrivate : public ObjectPrivate, public CallSessionListener {
public:
CallPrivate () = default;
void initiateIncoming ();
bool initiateOutgoing ();
void iterate (time_t currentRealTime, bool oneSecondElapsed);

2
src/call/remote-conference-call.h
View file

@ -42,7 +42,7 @@ public:
SalCallOp *op,
const MediaSessionParams *msp
);
virtual ~RemoteConferenceCall ();
~RemoteConferenceCall ();
std::shared_ptr<Core> getCore () const;

8
src/conference/conference-listener.h
View file

@ -20,22 +20,18 @@
#ifndef _L_CONFERENCE_LISTENER_H_
#define _L_CONFERENCE_LISTENER_H_
#include <ctime>
#include <string>
#include <vector>
#include "linphone/utils/general.h"
#include "event-log/events.h"
// =============================================================================
LINPHONE_BEGIN_NAMESPACE
class IdentityAddress;
class ConferenceListener {
public:
virtual ~ConferenceListener () = default;
virtual void onConferenceCreated (const IdentityAddress &addr) {}
virtual void onConferenceKeywordsChanged (const std::vector<std::string> &keywords) {}
virtual void onConferenceTerminated (const IdentityAddress &addr) {}

2
src/conference/conference.h
View file

@ -43,7 +43,7 @@ class LINPHONE_PUBLIC Conference :
friend class CallSessionPrivate;
public:
virtual ~Conference();
~Conference();
std::shared_ptr<Participant> getActiveParticipant () const;

2
src/conference/session/call-session-p.h
View file

@ -31,8 +31,6 @@ LINPHONE_BEGIN_NAMESPACE
class CallSessionPrivate : public ObjectPrivate, public CoreListener {
public:
CallSessionPrivate () = default;
int computeDuration () const;
virtual void initializeParamsAccordingToIncomingCallParams ();
void notifyReferState ();

2
src/conference/session/call-session.h
View file

@ -54,7 +54,7 @@ public:
L_DECLARE_ENUM(State, L_ENUM_VALUES_CALL_SESSION_STATE);
CallSession (const std::shared_ptr<Core> &core, const CallSessionParams *params, CallSessionListener *listener);
virtual ~CallSession ();
~CallSession ();
LinphoneStatus accept (const CallSessionParams *csp = nullptr);
LinphoneStatus acceptUpdate (const CallSessionParams *csp = nullptr);

2
src/conference/session/media-session.cpp
View file

@ -3432,7 +3432,7 @@ void MediaSessionPrivate::reportBandwidth () {
lInfo() << "Bandwidth usage for CallSession [" << q << "]:\n" << fixed << setprecision(2) <<
"\tRTP audio=[d=" << linphone_call_stats_get_download_bandwidth(audioStats) << ",u=" << linphone_call_stats_get_upload_bandwidth(audioStats) <<
"], video=[d=" << linphone_call_stats_get_download_bandwidth(videoStats) << ",u=" << linphone_call_stats_get_upload_bandwidth(videoStats) << ",ed=" << linphone_call_stats_get_estimated_download_bandwidth(videoStats) <<
"], video=[d=" << linphone_call_stats_get_download_bandwidth(videoStats) << ",u=" << linphone_call_stats_get_upload_bandwidth(videoStats) << ",ed=" << linphone_call_stats_get_estimated_download_bandwidth(videoStats) <<
"], text=[d=" << linphone_call_stats_get_download_bandwidth(textStats) << ",u=" << linphone_call_stats_get_upload_bandwidth(textStats) << "] kbits/sec\n" <<
"\tRTCP audio=[d=" << linphone_call_stats_get_rtcp_download_bandwidth(audioStats) << ",u=" << linphone_call_stats_get_rtcp_upload_bandwidth(audioStats) <<
"], video=[d=" << linphone_call_stats_get_rtcp_download_bandwidth(videoStats) << ",u=" << linphone_call_stats_get_rtcp_upload_bandwidth(videoStats) <<

2
src/conference/session/media-session.h
View file

@ -40,7 +40,7 @@ class LINPHONE_PUBLIC MediaSession : public CallSession {
public:
MediaSession (const std::shared_ptr<Core> &core, std::shared_ptr<Participant> me, const CallSessionParams *params, CallSessionListener *listener);
virtual ~MediaSession ();
~MediaSession ();
LinphoneStatus accept (const MediaSessionParams *msp = nullptr);
LinphoneStatus acceptEarlyMedia (const MediaSessionParams *msp = nullptr);