From bbd08f3aaf20907f6244e642d93592aedef41086 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 4 Aug 2017 14:44:10 +0200 Subject: [PATCH] fix merge --- coreapi/CMakeLists.txt | 5 +---- src/conference/local-conference-event-handler.cpp | 2 +- src/conference/remote-conference-event-handler.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 5bccca85d..06d84215d 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -184,11 +184,8 @@ set(LIBS ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${XML2_LIBRARIES} -<<<<<<< HEAD - /usr/local/Cellar/xerces-c/3.1.4/lib/libxerces-c.dylib -======= ${BELR_LIBRARIES} ->>>>>>> origin/master + /usr/local/Cellar/xerces-c/3.1.4/lib/libxerces-c.dylib ) if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(APPEND LIBS "Ws2_32") diff --git a/src/conference/local-conference-event-handler.cpp b/src/conference/local-conference-event-handler.cpp index ef26d59ef..ff0e6a3b5 100644 --- a/src/conference/local-conference-event-handler.cpp +++ b/src/conference/local-conference-event-handler.cpp @@ -55,7 +55,7 @@ void Conference::LocalConferenceEventHandlerPrivate::notifyAllExcept(string noti } // -------- Conference::LocalConferenceEventHandler public methods --------- -Conference::LocalConferenceEventHandler::LocalConferenceEventHandler(LinphoneCore *core, LocalConference *localConf) : Object(new LocalConferenceEventHandlerPrivate) { +Conference::LocalConferenceEventHandler::LocalConferenceEventHandler(LinphoneCore *core, LocalConference *localConf) : Object(*new LocalConferenceEventHandlerPrivate) { L_D(LocalConferenceEventHandler); xercesc::XMLPlatformUtils::Initialize(); d->conf = localConf; diff --git a/src/conference/remote-conference-event-handler.cpp b/src/conference/remote-conference-event-handler.cpp index 226aa9e4c..08ed76c36 100644 --- a/src/conference/remote-conference-event-handler.cpp +++ b/src/conference/remote-conference-event-handler.cpp @@ -34,7 +34,7 @@ public: }; // -------- Conference::RemoteConferenceEventHandler public methods --------- -Conference::RemoteConferenceEventHandler::RemoteConferenceEventHandler(LinphoneCore *lc, ConferenceListener *listener, LinphoneAddress *confAddr) : Object(new RemoteConferenceEventHandlerPrivate) { +Conference::RemoteConferenceEventHandler::RemoteConferenceEventHandler(LinphoneCore *lc, ConferenceListener *listener, LinphoneAddress *confAddr) : Object(*new RemoteConferenceEventHandlerPrivate) { L_D(RemoteConferenceEventHandler); xercesc::XMLPlatformUtils::Initialize(); d->lc = lc;