diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 17:44:39 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 17:44:39 -0400 |
| commit | c7ac396fce2c9106d064ce90530fcf722c829e05 (patch) | |
| tree | d9b1916bedad1dac8f6dd5463b107c98decdc8a2 | |
| parent | 8b946999a7e332249236d7317a76fdd8d3387dc7 (diff) | |
docs: fixes for doxygen warnings (and a simple build warning).
| -rw-r--r-- | gr-blocks/include/blocks/probe_rate.h | 2 | ||||
| -rw-r--r-- | gr-blocks/include/blocks/socket_pdu.h | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/udp_source_impl.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/gr-blocks/include/blocks/probe_rate.h b/gr-blocks/include/blocks/probe_rate.h index e08a9dce06..3401d2acd1 100644 --- a/gr-blocks/include/blocks/probe_rate.h +++ b/gr-blocks/include/blocks/probe_rate.h @@ -41,7 +41,7 @@ namespace gr { /*! * \brief Make a throughput measurement block * \param itemsize size of each stream item - * \param update_rate_sec minimum update time in seconds + * \param update_rate_ms minimum update time in milliseconds * \param alpha gain for running average filter */ static sptr make(size_t itemsize, double update_rate_ms = 500.0, double alpha = 0.0001); diff --git a/gr-blocks/include/blocks/socket_pdu.h b/gr-blocks/include/blocks/socket_pdu.h index 1a67f8358c..58d5ad2628 100644 --- a/gr-blocks/include/blocks/socket_pdu.h +++ b/gr-blocks/include/blocks/socket_pdu.h @@ -41,7 +41,9 @@ namespace gr { /*! * \brief Construct a SOCKET PDU interface - * \param dev Device name to create + * \param type type of socket (TCP_SERVER, TCP_CLIENT, UDP_SERVER, UDP_CLIENT) + * \param addr address of host + * \param port port number to use * \param MTU Maximum Transmission Unit size */ static sptr make(std::string type, std::string addr, std::string port, int MTU=10000); diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index b8847586be..16ed72ca21 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -143,7 +143,7 @@ namespace gr { // Make sure we never go beyond the boundary of the // residual buffer. This will just drop the last bit of // data in the buffer if we've run out of room. - if(d_residual + bytes_transferred > 50*d_payload_size) { + if((int)(d_residual + bytes_transferred) > (50*d_payload_size)) { GR_LOG_WARN(d_logger, "Too much data; dropping packet."); } else { |