diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
| commit | fc54c27b48028c9c8139175d40b4b061800f32e3 (patch) | |
| tree | bd4ef22159d5bd65458e50fb3e5050a9b63559bf /host/include | |
| parent | 9fe731cc371efee7f0051186697e611571c5b41b (diff) | |
| parent | 33c0b32db12ee154b1090360fbf76634590fdd3e (diff) | |
| download | uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.gz uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.bz2 uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/config.h.in | 2 | ||||
| -rw-r--r-- | host/include/uhd/rfnoc/block_ctrl_base.hpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/host/include/config.h.in b/host/include/config.h.in index b1958ae42..0e8982488 100644 --- a/host/include/config.h.in +++ b/host/include/config.h.in @@ -23,4 +23,6 @@ #cmakedefine UHD_VERSION_ABI ${UHD_VERSION_ABI} #cmakedefine UHD_VERSION_PATCH ${UHD_VERSION_PATCH} #cmakedefine ENABLE_USB +#ifndef UHD_VERSION #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@ +#endif diff --git a/host/include/uhd/rfnoc/block_ctrl_base.hpp b/host/include/uhd/rfnoc/block_ctrl_base.hpp index 724e155bb..778ded043 100644 --- a/host/include/uhd/rfnoc/block_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/block_ctrl_base.hpp @@ -304,7 +304,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 |