diff options
author | Martin Braun <martin.braun@ettus.com> | 2018-04-26 13:13:32 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-05-02 17:01:21 -0700 |
commit | 5d9a7c92d3eb0a9cb719e6e6386d533da59a51db (patch) | |
tree | 024bda2ede2231784b55c48e1a23ab39fd97182d /host/lib/usrp/gpsd_iface.cpp | |
parent | c52c0b69fc151c7596f9754e6b1e40dede531134 (diff) | |
download | uhd-5d9a7c92d3eb0a9cb719e6e6386d533da59a51db.tar.gz uhd-5d9a7c92d3eb0a9cb719e6e6386d533da59a51db.tar.bz2 uhd-5d9a7c92d3eb0a9cb719e6e6386d533da59a51db.zip |
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.
Diffstat (limited to 'host/lib/usrp/gpsd_iface.cpp')
-rw-r--r-- | host/lib/usrp/gpsd_iface.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp index 49880c8f7..6b47b6be5 100644 --- a/host/lib/usrp/gpsd_iface.cpp +++ b/host/lib/usrp/gpsd_iface.cpp @@ -6,12 +6,11 @@ // #include <cmath> +#include <stdint.h> #include <gps.h> -#include <boost/assign/list_of.hpp> #include <boost/bind.hpp> -#include <stdint.h> #include "boost/date_time/gregorian/gregorian.hpp" #include <boost/format.hpp> #include <boost/thread/shared_mutex.hpp> @@ -53,9 +52,13 @@ public: boost::thread t(boost::bind(&gpsd_iface_impl::_thread_fcn ,this)); _bthread.swap(t); - - _sensors = boost::assign::list_of<std::string>("gps_locked")("gps_time") \ - ("gps_position")("gps_gpgga")("gps_gprmc").to_container(_sensors); + _sensors = { + "gps_locked", + "gps_time", + "gps_position", + "gps_gpgga", + "gps_gprmc" + }; } virtual ~gpsd_iface_impl(void) |