Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netft_utils/include/netft_utils/netft_rdt_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class NetFTRDTDriver
std::string address_;
std::string frame_id_;

boost::asio::io_service io_service_;
boost::asio::io_context io_service_;
boost::asio::ip::udp::socket socket_;
boost::mutex mutex_;
boost::thread recv_thread_;
Expand Down
4 changes: 2 additions & 2 deletions netft_utils/src/netft_rdt_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ NetFTRDTDriver::NetFTRDTDriver(const std::string & address, const std::string &
system_status_(0)
{
// Construct UDP socket
const udp::endpoint netft_endpoint(boost::asio::ip::address_v4::from_string(address), RDT_PORT);
const udp::endpoint netft_endpoint(boost::asio::ip::make_address(address), RDT_PORT);
socket_.open(udp::v4());
socket_.connect(netft_endpoint);

Expand Down Expand Up @@ -353,7 +353,7 @@ bool NetFTRDTDriver::readCalibrationInformation(const std::string & address)
using boost::asio::ip::tcp;
tcp::socket calibration_socket(io_service_);
calibration_socket.connect(
tcp::endpoint(boost::asio::ip::address::from_string(address), TCP_PORT));
tcp::endpoint(boost::asio::ip::make_address(address), TCP_PORT));

// Set up request
CalibrationInfoCommand info_request;
Expand Down