From 0fccb00d6ba7d85f2bc11df5d1948b6c521cb8f6 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Wed, 23 Nov 2016 09:16:10 -0800
Subject: boost: Replaced units::demangle with core::demangle where appropriate

Boost moved this around in version 1.58.
---
 host/include/uhd/device3.hpp                     | 6 +++---
 host/lib/include/uhdlib/experts/expert_nodes.hpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/host/include/uhd/device3.hpp b/host/include/uhd/device3.hpp
index 8dca2bc47..c4d0d94fe 100644
--- a/host/include/uhd/device3.hpp
+++ b/host/include/uhd/device3.hpp
@@ -1,6 +1,7 @@
 //
 // Copyright 2014-2016 Ettus Research LLC
 // Copyright 2018 Ettus Research, a National Instruments Company
+// Copyright 2019 Ettus Research, a National Instruments Brand
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
@@ -11,8 +12,8 @@
 #include <uhd/device.hpp>
 #include <uhd/rfnoc/block_ctrl_base.hpp>
 #include <uhd/rfnoc/graph.hpp>
+#include <boost/core/demangle.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/units/detail/utility.hpp>
 #include <vector>
 
 namespace uhd {
@@ -97,8 +98,7 @@ public:
         } else {
             throw uhd::lookup_error(str(
                 boost::format("This device does not have a block of type %s with ID: %s")
-                % boost::units::detail::demangle(typeid(T).name())
-                % block_id.to_string()));
+                % boost::core::demangle(typeid(T).name()) % block_id.to_string()));
         }
     }
 
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
index e698b3a71..d1f38ac07 100644
--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
@@ -16,7 +16,7 @@
 #include <boost/function.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread.hpp>
-#include <boost/units/detail/utility.hpp>
+#include <boost/core/demangle.hpp>
 #include <memory>
 #include <list>
 #include <stdint.h>
@@ -133,7 +133,7 @@ namespace uhd { namespace experts {
         // Basic info
         virtual const std::string& get_dtype() const {
             static const std::string dtype(
-                boost::units::detail::demangle(typeid(data_t).name()));
+                boost::core::demangle(typeid(data_t).name()));
             return dtype;
         }
 
@@ -291,7 +291,7 @@ namespace uhd { namespace experts {
             _datanode = dynamic_cast< data_node_t<data_t>* >(&node());
             if (_datanode == NULL) {
                 throw uhd::type_error("Expected data type for node " + n +
-                                      " was " + boost::units::detail::demangle(typeid(data_t).name()) +
+                                      " was " + boost::core::demangle(typeid(data_t).name()) +
                                       " but got " + node().get_dtype());
             }
         }
-- 
cgit v1.2.3