From 5d9a7c92d3eb0a9cb719e6e6386d533da59a51db Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 26 Apr 2018 13:13:32 -0700 Subject: lib: Purge use of boost::assign, except for uhd::dict Replaced with initialization lists. Note: uhd::dict does not work with initializer lists without making changes to said data structure. This commit has no functional changes, so keeping the boost::assigns for uhd::dict. --- host/lib/usrp/gps_ctrl.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'host/lib/usrp/gps_ctrl.cpp') diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp index f030108cc..67803bec6 100644 --- a/host/lib/usrp/gps_ctrl.cpp +++ b/host/lib/usrp/gps_ctrl.cpp @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #include #include @@ -24,6 +22,7 @@ #include #include #include +#include using namespace uhd; using namespace boost::posix_time; @@ -137,7 +136,7 @@ private: return; } - const std::list keys = boost::assign::list_of("GPGGA")("GPRMC")("SERVO"); + const std::list keys{"GPGGA", "GPRMC", "SERVO"}; static const boost::regex servo_regex("^\\d\\d-\\d\\d-\\d\\d.*$"); static const boost::regex gp_msg_regex("^\\$GP.*,\\*[0-9A-F]{2}$"); std::map msgs; @@ -266,13 +265,14 @@ public: //return a list of supported sensors std::vector get_sensors(void) { - std::vector ret = boost::assign::list_of - ("gps_gpgga") - ("gps_gprmc") - ("gps_time") - ("gps_locked") - ("gps_servo"); - return ret; + std::vector ret{ + "gps_gpgga", + "gps_gprmc", + "gps_time", + "gps_locked", + "gps_servo" + }; + return ret; } uhd::sensor_value_t get_sensor(std::string key) { -- cgit v1.2.3