From ab1e07c8b702a93a7fd7d654bc61ccccd7ccfdc4 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Wed, 4 Oct 2017 11:42:47 +0200 Subject: [PATCH] fix build issues --- src/chat/chat-message.cpp | 2 +- src/content/content.cpp | 3 ++- src/content/content.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chat/chat-message.cpp b/src/chat/chat-message.cpp index fa4c931a7..822493530 100644 --- a/src/chat/chat-message.cpp +++ b/src/chat/chat-message.cpp @@ -1441,7 +1441,7 @@ void ChatMessage::cancelFileTransfer() { } if (!belle_http_request_is_cancelled(d->httpRequest)) { if (d->chatRoom) { - lInfo() << "Canceling file transfer " << (d->externalBodyUrl.empty()) ? linphone_core_get_file_transfer_server(d->chatRoom->getCore()) : d->externalBodyUrl.c_str(); + lInfo() << "Canceling file transfer " << (d->externalBodyUrl.empty() ? linphone_core_get_file_transfer_server(d->chatRoom->getCore()) : d->externalBodyUrl.c_str()); belle_http_provider_cancel_request(d->chatRoom->getCore()->http_provider, d->httpRequest); } else { lInfo() << "Warning: http request still running for ORPHAN msg: this is a memory leak"; diff --git a/src/content/content.cpp b/src/content/content.cpp index de2ebb9fb..c6e3c148f 100644 --- a/src/content/content.cpp +++ b/src/content/content.cpp @@ -71,7 +71,8 @@ Content &Content::operator= (Content &&src) { return *this; } -bool Content::operator==(const Content& content) { +<<<<<<< HEAD +bool Content::operator==(const Content& content) const { L_D(); return d->contentType == content.getContentType() && d->body == content.getBody() && d->contentDisposition == content.getContentDisposition(); } diff --git a/src/content/content.h b/src/content/content.h index c7f419223..f923c33d4 100644 --- a/src/content/content.h +++ b/src/content/content.h @@ -38,7 +38,7 @@ public: Content &operator= (const Content &src); Content &operator= (Content &&src); - bool operator==(const Content& content); + bool operator==(const Content& content) const; const ContentType &getContentType () const; void setContentType (const ContentType &contentType);