fix merge

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")

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;

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;