Skip to content

Commit

Permalink
Fixed compilation with Boost 1.70 (apache#4454)
Browse files Browse the repository at this point in the history
* Fixed compilation with Boost 1.70

* Fixed formatting
  • Loading branch information
merlimat authored Jun 4, 2019
1 parent 0851c75 commit 07845c5
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pulsar-client-cpp/lib/ExecutorService.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 &> >(
Expand All @@ -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() {
Expand Down

0 comments on commit 07845c5

Please sign in to comment.