summaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-08 11:03:38 -0700
committerJosh Blum <josh@joshknows.com>2010-08-08 11:03:38 -0700
commit1c241c282e5c7aaddc554885e15fae1c8aa93734 (patch)
treebe6476e3f61a4897912254e0d839170df348fe68 /host
parent03ccbeb6411c0c13adf54bde4c19372ffa141aa0 (diff)
downloaduhd-1c241c282e5c7aaddc554885e15fae1c8aa93734.tar.gz
uhd-1c241c282e5c7aaddc554885e15fae1c8aa93734.tar.bz2
uhd-1c241c282e5c7aaddc554885e15fae1c8aa93734.zip
uhd: fix device recv docs on timeout, also fix typo
Diffstat (limited to 'host')
-rw-r--r--host/include/uhd/device.hpp7
-rw-r--r--host/lib/utils/gain_group.cpp2
2 files changed, 2 insertions, 7 deletions
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp
index 78bb83c66..c48b3dfff 100644
--- a/host/include/uhd/device.hpp
+++ b/host/include/uhd/device.hpp
@@ -161,12 +161,7 @@ public:
* See the rx metadata fragment flags and offset fields for details.
*
* This is a blocking call and will not return until the number
- * of samples returned have been written into each buffer.
- * However, a call to receive may timeout and return zero samples.
- * The timeout duration is decided by the underlying transport layer.
- * The caller should assume that the call to receive will not return
- * immediately when no packets are available to the transport layer,
- * and that the timeout duration is reasonably tuned for performance.
+ * of samples returned have been written into each buffer or timeout.
*
* When using the full buffer recv mode, the metadata only applies
* to the first packet received and written into the recv buffers.
diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp
index 1be09dee2..c113719c8 100644
--- a/host/lib/utils/gain_group.cpp
+++ b/host/lib/utils/gain_group.cpp
@@ -131,7 +131,7 @@ private:
//! get the gain function sets in order (highest priority first)
std::vector<gain_fcns_t> get_all_fcns(void){
std::vector<gain_fcns_t> all_fcns;
- BOOST_FOREACH(ssize_t key, std::sorted(_registry.keys())){
+ BOOST_FOREACH(size_t key, std::sorted(_registry.keys())){
const std::vector<gain_fcns_t> &fcns = _registry[key];
all_fcns.insert(all_fcns.begin(), fcns.begin(), fcns.end());
}