aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/rfnoc
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2017-01-17 10:00:47 -0800
committerMartin Braun <martin.braun@ettus.com>2017-01-17 10:00:47 -0800
commit52ca2e0b8045c254c2be1911e77e8bd3d94ceeab (patch)
treec7e1a93eeadd65bb13db1aa68974da495114f046 /host/lib/rfnoc
parent46febf986ae5e89ebb0c350fd9aa42aaa6383997 (diff)
parent95ff7e859d57829e428d41d7746e28c228b983ba (diff)
downloaduhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.gz
uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.bz2
uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.zip
Merge branch 'maint'
Diffstat (limited to 'host/lib/rfnoc')
-rw-r--r--host/lib/rfnoc/block_ctrl_base.cpp1
-rw-r--r--host/lib/rfnoc/nocscript/function_table.cpp2
-rw-r--r--host/lib/rfnoc/xports.hpp1
3 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/rfnoc/block_ctrl_base.cpp b/host/lib/rfnoc/block_ctrl_base.cpp
index fa4928a69..4ee577891 100644
--- a/host/lib/rfnoc/block_ctrl_base.cpp
+++ b/host/lib/rfnoc/block_ctrl_base.cpp
@@ -504,7 +504,6 @@ std::string block_ctrl_base::get_arg(const std::string &key, const size_t port)
}
UHD_THROW_INVALID_CODE_PATH();
- return "";
}
std::string block_ctrl_base::get_arg_type(const std::string &key, const size_t port) const
diff --git a/host/lib/rfnoc/nocscript/function_table.cpp b/host/lib/rfnoc/nocscript/function_table.cpp
index bebceb8dc..a4e36c1a1 100644
--- a/host/lib/rfnoc/nocscript/function_table.cpp
+++ b/host/lib/rfnoc/nocscript/function_table.cpp
@@ -31,7 +31,7 @@ class function_table_impl : public function_table
expression::type_t return_type;
function_ptr function;
- function_info() {};
+ function_info(): return_type(expression::TYPE_INT) {};
function_info(const expression::type_t return_type_, const function_ptr &function_)
: return_type(return_type_), function(function_)
{};
diff --git a/host/lib/rfnoc/xports.hpp b/host/lib/rfnoc/xports.hpp
index 1ce05c6c8..7bd4f2fc8 100644
--- a/host/lib/rfnoc/xports.hpp
+++ b/host/lib/rfnoc/xports.hpp
@@ -25,6 +25,7 @@ namespace uhd {
*/
struct both_xports_t
{
+ both_xports_t(): recv_buff_size(0), send_buff_size(0) {}
uhd::transport::zero_copy_if::sptr recv;
uhd::transport::zero_copy_if::sptr send;
size_t recv_buff_size;