Skip to content
Merged
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ endif()
if(CMAKE_COMPILER_IS_GNUCXX)
if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7)
string(APPEND CMAKE_CXX_FLAGS " -Wabi=11")
string(APPEND CMAKE_CXX_FLAGS " -Wabi=18")
else()
string(APPEND CMAKE_CXX_FLAGS " -Wabi")
endif()
Expand Down
2 changes: 1 addition & 1 deletion apps/src/openni_mobile_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class PCLMobileServer {

viewer_.showCloud(getLatestPointCloud());

boost::asio::io_service io_service;
boost::asio::io_context io_service;
tcp::endpoint endpoint(tcp::v4(), static_cast<unsigned short>(port_));
tcp::acceptor acceptor(io_service, endpoint);
tcp::socket socket(io_service);
Expand Down
4 changes: 2 additions & 2 deletions apps/src/openni_octree_compression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,15 @@ main(int argc, char** argv)
if (bEnDecode) {
// ENCODING
try {
boost::asio::io_service io_service;
boost::asio::io_context io_service;
tcp::endpoint endpoint(tcp::v4(), 6666);
tcp::acceptor acceptor(io_service, endpoint);

tcp::iostream socketStream;

std::cout << "Waiting for connection.." << std::endl;

acceptor.accept(*socketStream.rdbuf());
acceptor.accept(socketStream.rdbuf()->socket());

std::cout << "Connected!" << std::endl;

Expand Down
4 changes: 2 additions & 2 deletions apps/src/openni_organized_compression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -438,15 +438,15 @@ main(int argc, char** argv)
if (bEnDecode) {
// ENCODING
try {
boost::asio::io_service io_service;
boost::asio::io_context io_service;
tcp::endpoint endpoint(tcp::v4(), 6666);
tcp::acceptor acceptor(io_service, endpoint);

tcp::iostream socketStream;

std::cout << "Waiting for connection.." << std::endl;

acceptor.accept(*socketStream.rdbuf());
acceptor.accept(socketStream.rdbuf()->socket());

std::cout << "Connected!" << std::endl;

Expand Down
2 changes: 1 addition & 1 deletion io/include/pcl/io/hdl_grabber.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ namespace pcl
boost::asio::ip::udp::endpoint udp_listener_endpoint_;
boost::asio::ip::address source_address_filter_;
std::uint16_t source_port_filter_;
boost::asio::io_service hdl_read_socket_service_;
boost::asio::io_context hdl_read_socket_service_;
boost::asio::ip::udp::socket *hdl_read_socket_;
std::string pcap_file_name_;
std::thread *queue_consumer_thread_;
Expand Down
2 changes: 1 addition & 1 deletion io/include/pcl/io/robot_eye_grabber.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ namespace pcl

boost::asio::ip::address sensor_address_;
boost::asio::ip::udp::endpoint sender_endpoint_;
boost::asio::io_service io_service_;
boost::asio::io_context io_service_;
std::shared_ptr<boost::asio::ip::udp::socket> socket_;
std::shared_ptr<std::thread> socket_thread_;
std::shared_ptr<std::thread> consumer_thread_;
Expand Down
2 changes: 1 addition & 1 deletion io/include/pcl/io/tim_grabber.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class PCL_EXPORTS TimGrabber : public Grabber
std::vector<float> distances_;

boost::asio::ip::tcp::endpoint tcp_endpoint_;
boost::asio::io_service tim_io_service_;
boost::asio::io_context tim_io_service_;
boost::asio::ip::tcp::socket tim_socket_;
//// wait time for receiving data (on the order of milliseconds)
unsigned int wait_time_milliseconds_ = 0;
Expand Down
2 changes: 1 addition & 1 deletion io/src/hdl_grabber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ pcl::HDLGrabber::loadHDL32Corrections ()
boost::asio::ip::address
pcl::HDLGrabber::getDefaultNetworkAddress ()
{
return (boost::asio::ip::address::from_string ("192.168.3.255"));
return (boost::asio::ip::make_address ("192.168.3.255"));
}

/////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion io/src/robot_eye_grabber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ void
pcl::RobotEyeGrabber::socketThreadLoop ()
{
asyncSocketReceive();
io_service_.reset();
io_service_.restart();
io_service_.run();
}

Expand Down
4 changes: 2 additions & 2 deletions io/src/tim_grabber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ pcl::TimGrabber::start ()

try {
boost::asio::ip::tcp::resolver resolver (tim_io_service_);
tcp_endpoint_ = *resolver.resolve (tcp_endpoint_);
tim_socket_.connect (tcp_endpoint_);
boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve (tcp_endpoint_);
boost::asio::connect(tim_socket_, endpoints);
}
catch (std::exception& e)
{
Expand Down
2 changes: 1 addition & 1 deletion io/src/vlp_grabber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pcl::VLPGrabber::loadVLP16Corrections ()
boost::asio::ip::address
pcl::VLPGrabber::getDefaultNetworkAddress ()
{
return (boost::asio::ip::address::from_string ("255.255.255.255"));
return (boost::asio::ip::make_address ("255.255.255.255"));
}

/////////////////////////////////////////////////////////////////////////////
Expand Down