aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2018-04-30 10:43:04 -0700
committerMartin Braun <martin.braun@ettus.com>2018-04-30 11:00:30 -0700
commit679e4949479678d5a12842e82fe922872f6198bf (patch)
treeb2d718d5e9fabb94b78d3cebb24226859b89a71e
parent5316636fb9400bc68c7f014a851b6bff001bc5b3 (diff)
downloaduhd-679e4949479678d5a12842e82fe922872f6198bf.tar.gz
uhd-679e4949479678d5a12842e82fe922872f6198bf.tar.bz2
uhd-679e4949479678d5a12842e82fe922872f6198bf.zip
fixup! rfnoc: ctrl_iface cleanup
-rw-r--r--host/lib/include/uhdlib/rfnoc/ctrl_iface.hpp2
-rw-r--r--host/lib/rfnoc/ctrl_iface.cpp1
-rw-r--r--host/tests/device3_test.cpp3
3 files changed, 2 insertions, 4 deletions
diff --git a/host/lib/include/uhdlib/rfnoc/ctrl_iface.hpp b/host/lib/include/uhdlib/rfnoc/ctrl_iface.hpp
index d89dea534..deb58f14c 100644
--- a/host/lib/include/uhdlib/rfnoc/ctrl_iface.hpp
+++ b/host/lib/include/uhdlib/rfnoc/ctrl_iface.hpp
@@ -21,7 +21,7 @@ class ctrl_iface
{
public:
typedef boost::shared_ptr<ctrl_iface> sptr;
- virtual ~ctrl_iface(void) = 0;
+ virtual ~ctrl_iface(void) {}
/*! Make a new control object
*
diff --git a/host/lib/rfnoc/ctrl_iface.cpp b/host/lib/rfnoc/ctrl_iface.cpp
index 9515cda0d..719341717 100644
--- a/host/lib/rfnoc/ctrl_iface.cpp
+++ b/host/lib/rfnoc/ctrl_iface.cpp
@@ -264,4 +264,3 @@ ctrl_iface::sptr ctrl_iface::make(
);
}
}
-
diff --git a/host/tests/device3_test.cpp b/host/tests/device3_test.cpp
index d3f7aa2ee..3a7f7c6cb 100644
--- a/host/tests/device3_test.cpp
+++ b/host/tests/device3_test.cpp
@@ -5,7 +5,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
-#include "../lib/rfnoc/ctrl_iface.hpp"
#include <uhd/property_tree.hpp>
#include <uhd/types/wb_iface.hpp>
#include <uhd/device3.hpp>
@@ -28,7 +27,7 @@ static const sid_t TEST_SID1 = 0x00000210; // 0.0.2.F
class pseudo_ctrl_iface_impl : public ctrl_iface
{
public:
- pseudo_ctrl_iface_impl() {};
+ pseudo_ctrl_iface_impl() {}
virtual ~pseudo_ctrl_iface_impl() {}
uint64_t send_cmd_pkt(