summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-11 12:19:03 -0800
committerJosh Blum <josh@joshknows.com>2010-11-11 12:19:03 -0800
commite0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd (patch)
tree40276e2499f25816ba14456b8439b7caf9783c0d /host/include
parentb7b3e8288dcd64e47c242edbc5b009b9300615a2 (diff)
downloaduhd-e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd.tar.gz
uhd-e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd.tar.bz2
uhd-e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd.zip
uhd: pulled in some worthwhile changes from flow control branch
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/transport/udp_simple.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/include/uhd/transport/udp_simple.hpp b/host/include/uhd/transport/udp_simple.hpp
index c84393ecf..83f895ba9 100644
--- a/host/include/uhd/transport/udp_simple.hpp
+++ b/host/include/uhd/transport/udp_simple.hpp
@@ -73,10 +73,10 @@ public:
* Receive into the provided buffer.
* Blocks until data is received or a timeout occurs.
* \param buff a mutable buffer to receive into
- * \param timeout_ms the timeout in milliseconds
+ * \param timeout the timeout in seconds
* \return the number of bytes received or zero on timeout
*/
- virtual size_t recv(const boost::asio::mutable_buffer &buff, size_t timeout_ms) = 0;
+ virtual size_t recv(const boost::asio::mutable_buffer &buff, double timeout = 0.1) = 0;
};
}} //namespace