diff options
author | Tom Rondeau <tom@trondeau.com> | 2015-03-13 09:30:17 -0400 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2015-03-13 09:30:17 -0400 |
commit | 5fd8738eae397739ebf9fa9518dc587b40b3464e (patch) | |
tree | 2ef081c749fb252206eaa25275502adc72e08825 /gr-blocks/include | |
parent | 60b85d7a8f7ca142287090b3c53fc01c7c612358 (diff) | |
parent | 13cf0ce205bfc986e462591764cb7ca16e21346c (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-blocks/include')
-rw-r--r-- | gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t | 3 | ||||
-rw-r--r-- | gr-blocks/include/gnuradio/blocks/udp_source.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t index 56a8b1b707..20931f1cc7 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t @@ -91,10 +91,9 @@ namespace gr { */ virtual void set_tag_propagation_policy(gr::block::tag_propagation_policy_t p) = 0; - static const int TPP_SELECT_BY_MATRIX = 999; + static const int TPP_SELECT_BY_MATRIX; static const std::string MSG_PORT_NAME_SET_A; }; - const std::string @NAME@::MSG_PORT_NAME_SET_A = "set_A"; } // namespace blocks } // namespace gr diff --git a/gr-blocks/include/gnuradio/blocks/udp_source.h b/gr-blocks/include/gnuradio/blocks/udp_source.h index 67c31a7c60..d1b4062b79 100644 --- a/gr-blocks/include/gnuradio/blocks/udp_source.h +++ b/gr-blocks/include/gnuradio/blocks/udp_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007-2010,2013 Free Software Foundation, Inc. + * Copyright 2007-2010,2013,2015 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -43,7 +43,7 @@ namespace gr { * \brief UDP Source Constructor * * \param itemsize The size (in bytes) of the item datatype - * \param host The name or IP address of the receiving host; can be + * \param host The name or IP address of the transmitting host; can be * NULL, None, or "0.0.0.0" to allow reading from any * interface on the host * \param port The port number on which to receive data; use 0 to |