You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/06/04 03:57:16 UTC

[pulsar] branch master updated: Fixed compilation with Boost 1.70 (#4454)

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 07845c5  Fixed compilation with Boost 1.70 (#4454)
07845c5 is described below

commit 07845c5b463b35824f7b4bcab526e90e53489cdb
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Mon Jun 3 20:57:09 2019 -0700

    Fixed compilation with Boost 1.70 (#4454)
    
    * Fixed compilation with Boost 1.70
    
    * Fixed formatting
---
 pulsar-client-cpp/lib/ExecutorService.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pulsar-client-cpp/lib/ExecutorService.cc b/pulsar-client-cpp/lib/ExecutorService.cc
index 0ef77b3..4d3e4ed 100644
--- a/pulsar-client-cpp/lib/ExecutorService.cc
+++ b/pulsar-client-cpp/lib/ExecutorService.cc
@@ -33,9 +33,7 @@ ExecutorService::~ExecutorService() { close(); }
  *  factory method of boost::asio::ip::tcp::socket associated with io_service_ instance
  *  @ returns shared_ptr to this socket
  */
-SocketPtr ExecutorService::createSocket() {
-    return std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
-}
+SocketPtr ExecutorService::createSocket() { return SocketPtr(new boost::asio::ip::tcp::socket(io_service_)); }
 
 TlsSocketPtr ExecutorService::createTlsSocket(SocketPtr &socket, boost::asio::ssl::context &ctx) {
     return std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket &> >(
@@ -47,11 +45,11 @@ TlsSocketPtr ExecutorService::createTlsSocket(SocketPtr &socket, boost::asio::ss
  *  @returns shraed_ptr to resolver object
  */
 TcpResolverPtr ExecutorService::createTcpResolver() {
-    return std::make_shared<boost::asio::ip::tcp::resolver>(std::ref(io_service_));
+    return TcpResolverPtr(new boost::asio::ip::tcp::resolver(io_service_));
 }
 
 DeadlineTimerPtr ExecutorService::createDeadlineTimer() {
-    return std::make_shared<boost::asio::deadline_timer>(std::ref(io_service_));
+    return DeadlineTimerPtr(new boost::asio::deadline_timer(io_service_));
 }
 
 void ExecutorService::close() {