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/usrp1 | |
| 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/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 9dee15049..2bd573652 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -15,7 +15,6 @@ #include <uhd/utils/static.hpp> #include <uhd/utils/paths.hpp> #include <boost/format.hpp> -#include <boost/assign/list_of.hpp> #include <boost/filesystem.hpp> #include <boost/thread/thread.hpp> #include <boost/lexical_cast.hpp> @@ -30,9 +29,10 @@ const uint16_t USRP1_VENDOR_ID = 0xfffe; const uint16_t USRP1_PRODUCT_ID = 0x0002; static const boost::posix_time::milliseconds REENUMERATION_TIMEOUT_MS(3000); -const std::vector<usrp1_impl::dboard_slot_t> usrp1_impl::_dboard_slots = boost::assign::list_of - (usrp1_impl::DBOARD_SLOT_A)(usrp1_impl::DBOARD_SLOT_B) -; +const std::vector<usrp1_impl::dboard_slot_t> usrp1_impl::_dboard_slots{ + usrp1_impl::DBOARD_SLOT_A, + usrp1_impl::DBOARD_SLOT_B +}; /*********************************************************************** * Discovery |