Fixed building on RHEL/CentOS 8.

src/CMakeLists.txt

@@ -168,7 +168,8 @@ endif()
 ## set flags
 option(build_common "Build the Goby Common library" ON)  
 
-
+## Enable use of deprectect Proj API
+add_definitions(-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H)
 
 macro(goby_install_lib target_lib)
   set_property(TARGET ${target_lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES

src/acomms/amac/mac_manager.h

@@ -34,6 +34,7 @@
 #include "goby/acomms/protobuf/amac.pb.h"
 #include "goby/acomms/protobuf/amac_config.pb.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
+#include "goby/common/io_service.h"
 #include "goby/common/time.h"
 #include "goby/util/as.h"
 

src/acomms/modemdriver/iridium_driver.cpp

@@ -21,6 +21,7 @@
 // along with Goby.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <algorithm>
+#include <boost/version.hpp>
 
 #include "iridium_driver.h"
 
@@ -94,7 +95,11 @@ void goby::acomms::IridiumDriver::modem_init()
 
         if (driver_cfg_.GetExtension(IridiumDriverConfig::use_dtr) && modem().active() && !dtr_set)
         {
+#if BOOST_VERSION < 104700
             serial_fd_ = dynamic_cast<util::SerialClient&>(modem()).socket().native();
+#else
+            serial_fd_ = dynamic_cast<util::SerialClient&>(modem()).socket().native_handle();
+#endif
             set_dtr(true);
             glog.is(DEBUG1) && glog << group(glog_out_group()) << "DTR is: " << query_dtr()
                                     << std::endl;

src/acomms/modemdriver/iridium_shore_driver.cpp

@@ -24,6 +24,7 @@
 
 #include "goby/acomms/modemdriver/driver_exception.h"
 #include "goby/acomms/modemdriver/rudics_packet.h"
+#include "goby/common/io_service.h"
 #include "goby/common/logger.h"
 #include "goby/common/time.h"
 #include "goby/util/binary.h"

src/acomms/modemdriver/iridium_shore_driver.h

@@ -34,6 +34,7 @@
 #include "goby/acomms/protobuf/iridium_sbd_directip.pb.h"
 #include "goby/acomms/protobuf/iridium_shore_driver.pb.h"
 #include "goby/common/time.h"
+#include "goby/common/io_service.h"
 
 namespace goby
 {

src/acomms/modemdriver/iridium_shore_rudics.h

@@ -29,6 +29,7 @@
 #include <boost/signals2.hpp>
 
 #include "goby/common/time.h"
+#include "goby/common/io_service.h"
 #include "goby/util/binary.h"
 
 namespace goby

src/acomms/modemdriver/iridium_shore_sbd.h

@@ -26,6 +26,7 @@
 #include "goby/acomms/protobuf/iridium_sbd_directip.pb.h"
 #include "goby/acomms/protobuf/rudics_shore.pb.h"
 #include "goby/common/time.h"
+#include "goby/common/io_service.h"
 #include "goby/util/binary.h"
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>

src/acomms/modemdriver/mm_driver.cpp

@@ -25,6 +25,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign.hpp>
 #include <boost/foreach.hpp>
+#include <boost/version.hpp>
 
 #include <dccl/bitset.h>
 
@@ -112,7 +113,11 @@ void goby::acomms::MMDriver::startup(const protobuf::DriverConfig& cfg)
         // Grab our native file descrpitor for the serial port.  Only works for linux.
         // Used to change control lines (e.g. RTS) w/ linux through IOCTL calls.
         // Would need #ifdef's for conditional compling if other platforms become desired.
+#if BOOST_VERSION < 104700
         serial_fd_ = dynamic_cast<util::SerialClient&>(modem()).socket().native();
+#else
+        serial_fd_ = dynamic_cast<util::SerialClient&>(modem()).socket().native_handle();
+#endif
 
         // The MM2 (at least, possibly MM1 as well) has an issue where serial comms are
         // garbled when RTS is asserted and hardware flow control is disabled (HFC0).

src/acomms/modemdriver/udp_driver.cpp

@@ -24,6 +24,7 @@
 
 #include "goby/acomms/modemdriver/driver_exception.h"
 #include "goby/acomms/modemdriver/mm_driver.h"
+#include "goby/common/io_service.h"
 #include "goby/common/logger.h"
 #include "goby/util/binary.h"
 

src/acomms/modemdriver/udp_driver.h

@@ -24,6 +24,7 @@
 #define UDPModemDriver20120409H
 
 #include "goby/common/time.h"
+#include "goby/common/io_service.h"
 
 #include "goby/acomms/modemdriver/driver_base.h"
 #include "goby/acomms/protobuf/udp_driver.pb.h"

src/apps/acomms/goby_modemdriver/modemdriver.cpp

@@ -19,6 +19,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Goby.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "goby/common/io_service.h"
 #include "goby/common/logger.h"
 #include "goby/common/logger/term_color.h"
 #include "goby/common/zeromq_service.h"

src/apps/acomms/goby_mosh_relay/mosh_relay.cpp

@@ -21,6 +21,7 @@
 
 #include <boost/asio.hpp>
 
+#include "goby/common/io_service.h"
 #include "goby/common/logger.h"
 
 #include "goby/pb/application.h"

src/apps/moos/pAcommsHandler/pAcommsHandler.cpp

@@ -33,6 +33,7 @@
 #include "goby/acomms/modemdriver/iridium_driver.h"
 #include "goby/acomms/modemdriver/iridium_shore_driver.h"
 #include "goby/acomms/modemdriver/udp_driver.h"
+#include "goby/common/io_service.h"
 #include "goby/moos/moos_bluefin_driver.h"
 #include "goby/moos/moos_protobuf_helpers.h"
 #include "goby/moos/moos_ufield_sim_driver.h"

src/apps/moos/pAcommsHandler/pAcommsHandler.h

@@ -32,6 +32,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include "goby/acomms.h"
+#include "goby/common/io_service.h"
 #include "goby/util.h"
 
 #ifdef ENABLE_GOBY_V1_TRANSITIONAL_SUPPORT

src/apps/moos/pTranslator/pTranslator.h

@@ -26,6 +26,7 @@
 
 #include <boost/asio/deadline_timer.hpp>
 
+#include "goby/common/io_service.h"
 #include "goby/moos/goby_moos_app.h"
 #include "goby/moos/moos_translator.h"
 #include "goby/util/dynamic_protobuf_manager.h"

src/common/io_service.h

@@ -0,0 +1,45 @@
+// Copyright 2009-2018 Toby Schneider (http://gobysoft.org/index.wt/people/toby)
+//                     GobySoft, LLC (2013-)
+//                     Massachusetts Institute of Technology (2007-2014)
+//                     Community contributors (see AUTHORS file)
+//
+//
+// This file is part of the Goby Underwater Autonomy Project Libraries
+// ("The Goby Libraries").
+//
+// The Goby Libraries are free software: you can redistribute them and/or modify
+// them under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// The Goby Libraries are distributed in the hope that they will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Goby.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#ifndef IO_SERVICE20200522H
+#define IO_SERVICE20200522H
+
+#include <boost/version.hpp>
+
+// boost::asio::io_service was deprected in 1.66
+#if BOOST_VERSION >= 106600
+
+#include <boost/asio.hpp>
+
+namespace boost
+{
+namespace asio
+{
+  typedef io_context io_service;
+} // namespace asio
+} // namespace boost
+
+#endif
+
+#endif
+