From bafc0a045cbea2bb2e5aee9c4f95855bb6fde8d3 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 28 Oct 2016 13:54:45 -0700 Subject: cmake: Remove duplicate definitions of UHD_VERSION --- host/include/config.h.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'host/include') diff --git a/host/include/config.h.in b/host/include/config.h.in index 8931d6580..8e72a1f00 100644 --- a/host/include/config.h.in +++ b/host/include/config.h.in @@ -23,4 +23,6 @@ #cmakedefine UHD_VERSION_ABI ${TRIMMED_VERSION_ABI} #cmakedefine UHD_VERSION_PATCH ${TRIMMED_VERSION_PATCH} #cmakedefine ENABLE_USB +#ifndef UHD_VERSION #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@ +#endif -- cgit v1.2.3 From f00463d2c39185d70eeef8772de74e3a68f26843 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 23 Nov 2016 09:37:03 -0800 Subject: rfnoc: Matched signatures for clear() --- host/include/uhd/rfnoc/block_ctrl_base.hpp | 2 +- host/lib/rfnoc/block_ctrl_base.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'host/include') diff --git a/host/include/uhd/rfnoc/block_ctrl_base.hpp b/host/include/uhd/rfnoc/block_ctrl_base.hpp index 725f0d966..f770cf129 100644 --- a/host/include/uhd/rfnoc/block_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/block_ctrl_base.hpp @@ -306,7 +306,7 @@ public: * * TODO: Find better name (it disconnects, clears FC...) */ - void clear(const size_t port = 0/* reserved, currently not used */); + void clear(); /*********************************************************************** * Argument handling diff --git a/host/lib/rfnoc/block_ctrl_base.cpp b/host/lib/rfnoc/block_ctrl_base.cpp index c273fa76b..a4e7cb391 100644 --- a/host/lib/rfnoc/block_ctrl_base.cpp +++ b/host/lib/rfnoc/block_ctrl_base.cpp @@ -409,7 +409,7 @@ void block_ctrl_base::clear_command_time(const size_t port) iface_sptr->set_time(time_spec_t(0.0)); } -void block_ctrl_base::clear(const size_t /* port */) +void block_ctrl_base::clear() { UHD_RFNOC_BLOCK_TRACE() << "block_ctrl_base::clear() " << std::endl; // Call parent... -- cgit v1.2.3