From 5d9a7c92d3eb0a9cb719e6e6386d533da59a51db Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
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/x300/x300_radio_ctrl_impl.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'host/lib/usrp/x300')

diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
index cf1d9d7c2..453522249 100644
--- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
@@ -18,7 +18,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/date_time/posix_time/posix_time_io.hpp>
-#include <boost/assign/list_of.hpp>
 #include <chrono>
 #include <thread>
 
@@ -547,7 +546,7 @@ double x300_radio_ctrl_impl::get_output_samp_rate(size_t chan)
 
 std::vector<std::string> x300_radio_ctrl_impl::get_gpio_banks() const
 {
-    std::vector<std::string> banks = boost::assign::list_of("RX")("TX");
+    std::vector<std::string> banks{"RX", "TX"};
     // These pairs are the same, but RXA/TXA are from pre-rfnoc era and are kept for backward compat:
     banks.push_back("RX"+_radio_slot);
     banks.push_back("TX"+_radio_slot);
@@ -626,10 +625,16 @@ void x300_radio_ctrl_impl::setup_radio(
     static const size_t RX_EEPROM_ADDR  = 0x5;
     static const size_t TX_EEPROM_ADDR  = 0x4;
     static const size_t GDB_EEPROM_ADDR = 0x1;
-    const static std::vector<size_t> EEPROM_ADDRS =
-        boost::assign::list_of(RX_EEPROM_ADDR)(TX_EEPROM_ADDR)(GDB_EEPROM_ADDR);
-    const static std::vector<std::string> EEPROM_PATHS =
-        boost::assign::list_of("rx_eeprom")("tx_eeprom")("gdb_eeprom");
+    const static std::vector<size_t> EEPROM_ADDRS{
+        RX_EEPROM_ADDR,
+        TX_EEPROM_ADDR,
+        GDB_EEPROM_ADDR
+    };
+    const static std::vector<std::string> EEPROM_PATHS{
+        "rx_eeprom",
+        "tx_eeprom",
+        "gdb_eeprom"
+    };
 
     const size_t DB_OFFSET = (_radio_slot == "A") ? 0x0 : 0x2;
     const fs_path db_path = ("dboards" / _radio_slot);
-- 
cgit v1.2.3