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/rfnoc/blockdef_xml_impl.cpp    | 13 ++++++-------
 host/lib/rfnoc/legacy_compat.cpp        |  5 ++---
 host/lib/rfnoc/nocscript/expression.cpp | 15 +++++++--------
 3 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'host/lib/rfnoc')

diff --git a/host/lib/rfnoc/blockdef_xml_impl.cpp b/host/lib/rfnoc/blockdef_xml_impl.cpp
index 50faf6905..26622d649 100644
--- a/host/lib/rfnoc/blockdef_xml_impl.cpp
+++ b/host/lib/rfnoc/blockdef_xml_impl.cpp
@@ -10,7 +10,6 @@
 #include <uhd/rfnoc/blockdef.hpp>
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/paths.hpp>
-#include <boost/assign/list_of.hpp>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
@@ -102,13 +101,13 @@ const device_addr_t blockdef::arg_t::ARG_ARGS(
         "port=0,"
 );
 
-const std::set<std::string> blockdef::arg_t::VALID_TYPES = boost::assign::list_of
+const std::set<std::string> blockdef::arg_t::VALID_TYPES = {
     // List all tags/args a <type> can have here:
-            ("string")
-            ("int")
-            ("int_vector")
-            ("double")
-;
+    "string",
+    "int",
+    "int_vector",
+    "double"
+};
 
 blockdef::arg_t::arg_t()
 {
diff --git a/host/lib/rfnoc/legacy_compat.cpp b/host/lib/rfnoc/legacy_compat.cpp
index 0ccc5d19d..e10d40511 100644
--- a/host/lib/rfnoc/legacy_compat.cpp
+++ b/host/lib/rfnoc/legacy_compat.cpp
@@ -20,7 +20,6 @@
 #include <uhd/usrp/multi_usrp.hpp>
 #include <uhdlib/rfnoc/legacy_compat.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/assign.hpp>
 
 #define UHD_LEGACY_LOG() UHD_LOGGER_TRACE("RFNOC")
 
@@ -359,7 +358,7 @@ public:
                 }
             }
         } else {
-            std::set<size_t> chans_to_change = boost::assign::list_of(chan);
+            std::set<size_t> chans_to_change{chan};
             if (_rx_stream_cache.count(chan)) {
                 uhd::rx_streamer::sptr str_ptr = _rx_stream_cache[chan].lock();
                 if (str_ptr) {
@@ -402,7 +401,7 @@ public:
                 }
             }
         } else {
-            std::set<size_t> chans_to_change = boost::assign::list_of(chan);
+            std::set<size_t> chans_to_change{chan};
             if (_tx_stream_cache.count(chan)) {
                 uhd::tx_streamer::sptr str_ptr = _tx_stream_cache[chan].lock();
                 if (str_ptr) {
diff --git a/host/lib/rfnoc/nocscript/expression.cpp b/host/lib/rfnoc/nocscript/expression.cpp
index 41b9c5403..1a7f3ee94 100644
--- a/host/lib/rfnoc/nocscript/expression.cpp
+++ b/host/lib/rfnoc/nocscript/expression.cpp
@@ -9,18 +9,17 @@
 #include "function_table.hpp"
 #include <uhd/utils/cast.hpp>
 #include <boost/format.hpp>
-#include <boost/assign.hpp>
 #include <boost/algorithm/string.hpp>
 
 using namespace uhd::rfnoc::nocscript;
 
-std::map<expression::type_t, std::string> expression::type_repr = boost::assign::map_list_of
-    (TYPE_INT, "INT")
-    (TYPE_DOUBLE, "DOUBLE")
-    (TYPE_STRING, "STRING")
-    (TYPE_BOOL, "BOOL")
-    (TYPE_INT_VECTOR, "INT_VECTOR")
-;
+std::map<expression::type_t, std::string> expression::type_repr{
+    {TYPE_INT, "INT"},
+    {TYPE_DOUBLE, "DOUBLE"},
+    {TYPE_STRING, "STRING"},
+    {TYPE_BOOL, "BOOL"},
+    {TYPE_INT_VECTOR, "INT_VECTOR"}
+};
 
 /********************************************************************
  * Literal expressions (constants)
-- 
cgit v1.2.3