From 041f44e809f39d0567f6f191284d555cd6d08de2 Mon Sep 17 00:00:00 2001
From: Marcus Müller <mmueller@gnuradio.org>
Date: Tue, 19 Oct 2021 20:44:11 +0200
Subject: Replace boost::any with std::any
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is a modernization possible through C++17
Fixes #4780
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
---
gnuradio-runtime/lib/pmt/pmt.cc | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
(limited to 'gnuradio-runtime/lib/pmt/pmt.cc')
diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc
index d4ada683f9..043b9eb6a6 100644
--- a/gnuradio-runtime/lib/pmt/pmt.cc
+++ b/gnuradio-runtime/lib/pmt/pmt.cc
@@ -16,6 +16,7 @@
#include <gnuradio/messages/msg_accepter.h>
#include <pmt/pmt.h>
#include <pmt/pmt_pool.h>
+#include <any>
#include <cstdio>
#include <cstring>
#include <vector>
@@ -741,20 +742,20 @@ pmt_t dict_values(pmt_t dict)
// Any
////////////////////////////////////////////////////////////////////////////
-pmt_any::pmt_any(const boost::any& any) : d_any(any) {}
+pmt_any::pmt_any(const std::any& any) : d_any(any) {}
bool is_any(pmt_t obj) { return obj->is_any(); }
-pmt_t make_any(const boost::any& any) { return pmt_t(new pmt_any(any)); }
+pmt_t make_any(const std::any& any) { return pmt_t(new pmt_any(any)); }
-boost::any any_ref(pmt_t obj)
+std::any any_ref(pmt_t obj)
{
if (!obj->is_any())
throw wrong_type("pmt_any_ref", obj);
return _any(obj)->ref();
}
-void any_set(pmt_t obj, const boost::any& any)
+void any_set(pmt_t obj, const std::any& any)
{
if (!obj->is_any())
throw wrong_type("pmt_any_set", obj);
@@ -770,8 +771,8 @@ bool is_msg_accepter(const pmt_t& obj)
if (!is_any(obj))
return false;
- boost::any r = any_ref(obj);
- return boost::any_cast<gr::messages::msg_accepter_sptr>(&r) != 0;
+ std::any r = any_ref(obj);
+ return std::any_cast<gr::messages::msg_accepter_sptr>(&r) != 0;
}
//! make a msg_accepter
@@ -781,8 +782,8 @@ pmt_t make_msg_accepter(gr::messages::msg_accepter_sptr ma) { return make_any(ma
gr::messages::msg_accepter_sptr msg_accepter_ref(const pmt_t& obj)
{
try {
- return boost::any_cast<gr::messages::msg_accepter_sptr>(any_ref(obj));
- } catch (boost::bad_any_cast& e) {
+ return std::any_cast<gr::messages::msg_accepter_sptr>(any_ref(obj));
+ } catch (std::bad_any_cast& e) {
throw wrong_type("pmt_msg_accepter_ref", obj);
}
}
--
cgit v1.2.3