diff options
| author | me@boku.ru <me@boku.ru> | 2019-05-31 18:04:51 +0300 |
|---|---|---|
| committer | vitalyster <vitalyster@gmail.com> | 2019-06-01 18:19:56 +0300 |
| commit | a8e7c07b933691a8098c887e91c823f682f9c651 (patch) | |
| tree | 2f252dd52b8ea2df281eb0412fe46f08f69da22e /libtransport | |
| parent | 347aea856915aa77e2d6a8c4257d2dcb2252d729 (diff) | |
Restore C++98 compatibility
Diffstat (limited to 'libtransport')
| -rw-r--r-- | libtransport/HTTPRequest.cpp | 4 | ||||
| -rw-r--r-- | libtransport/NetworkPluginServer.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libtransport/HTTPRequest.cpp b/libtransport/HTTPRequest.cpp index 746254bf..246c68ac 100644 --- a/libtransport/HTTPRequest.cpp +++ b/libtransport/HTTPRequest.cpp @@ -104,8 +104,8 @@ bool HTTPRequest::GET(std::string url, Json::Value &json) { } Json::CharReaderBuilder rbuilder; - std::unique_ptr<Json::CharReader> const reader(rbuilder.newCharReader()); - if (!reader->parse(m_data.c_str(), m_data.c_str() + m_data.size(), &json, nullptr)) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Json::CharReader> const reader(rbuilder.newCharReader()); + if (!reader->parse(m_data.c_str(), m_data.c_str() + m_data.size(), &json, NULL)) { LOG4CXX_ERROR(logger, "Error while parsing JSON"); LOG4CXX_ERROR(logger, m_data); strcpy(curl_errorbuffer, "Error while parsing JSON"); diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp index 2e44bfdd..f1d3bffc 100644 --- a/libtransport/NetworkPluginServer.cpp +++ b/libtransport/NetworkPluginServer.cpp @@ -1840,9 +1840,10 @@ std::string plaintext_trim(std::string &text) { Swift::Message::ref copySwiftMessage(const Swift::Message* msg, const std::string& xhtml, const std::string& body) { Swift::Message::ref this_msg(new Swift::Message()); //Copy all payloads by reference, except for body and XHTML - for (Swift::Payload::ref pl : msg->getPayloads()) { - if(!dynamic_cast<Swift::Body*>(pl.get()) && !dynamic_cast<Swift::XHTMLIMPayload*>(pl.get())) - this_msg->addPayload(pl); + std::vector<Swift::Payload::ref> payloads = msg->getPayloads(); + for (size_t i=0; i<payloads.size(); i++) { + if(!dynamic_cast<Swift::Body*>(payloads[i].get()) && !dynamic_cast<Swift::XHTMLIMPayload*>(payloads[i].get())) + this_msg->addPayload(payloads[i]); } //Add new body and XHTML tags this_msg->setBody(body); |