Commit bbd08f3a authored by Benjamin REIS's avatar Benjamin REIS
Browse files

fix merge

parent cf86a35a
...@@ -184,11 +184,8 @@ set(LIBS ...@@ -184,11 +184,8 @@ set(LIBS
${MEDIASTREAMER2_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}
${ORTP_LIBRARIES} ${ORTP_LIBRARIES}
${XML2_LIBRARIES} ${XML2_LIBRARIES}
<<<<<<< HEAD
/usr/local/Cellar/xerces-c/3.1.4/lib/libxerces-c.dylib
=======
${BELR_LIBRARIES} ${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") if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND LIBS "Ws2_32") list(APPEND LIBS "Ws2_32")
......
...@@ -55,7 +55,7 @@ void Conference::LocalConferenceEventHandlerPrivate::notifyAllExcept(string noti ...@@ -55,7 +55,7 @@ void Conference::LocalConferenceEventHandlerPrivate::notifyAllExcept(string noti
} }
// -------- Conference::LocalConferenceEventHandler public methods --------- // -------- 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); L_D(LocalConferenceEventHandler);
xercesc::XMLPlatformUtils::Initialize(); xercesc::XMLPlatformUtils::Initialize();
d->conf = localConf; d->conf = localConf;
......
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
}; };
// -------- Conference::RemoteConferenceEventHandler public methods --------- // -------- 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); L_D(RemoteConferenceEventHandler);
xercesc::XMLPlatformUtils::Initialize(); xercesc::XMLPlatformUtils::Initialize();
d->lc = lc; d->lc = lc;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment