diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 13:26:22 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 13:26:22 -0400 |
| commit | 73367de69a1384295937945549d210d51a0a19ef (patch) | |
| tree | b19f5f71b87cac8497f3a2c90afbd1e62b7d8d00 /gnuradio-runtime/include/gr_block_detail.h | |
| parent | 2caaabf8e1dd771174fd42e51c8c8090864638e6 (diff) | |
| parent | 8088f125a9a432de321c62b82755a895d5184080 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-runtime/include/gr_block.h
Diffstat (limited to 'gnuradio-runtime/include/gr_block_detail.h')
| -rw-r--r-- | gnuradio-runtime/include/gr_block_detail.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/include/gr_block_detail.h b/gnuradio-runtime/include/gr_block_detail.h index c197266769..d24148f951 100644 --- a/gnuradio-runtime/include/gr_block_detail.h +++ b/gnuradio-runtime/include/gr_block_detail.h @@ -159,9 +159,9 @@ class GR_RUNTIME_API gr_block_detail { /*! * \brief Set core affinity of block to the cores in the vector mask. * - * \param mask a vector of unsigned ints of the core numbers available to this block. + * \param mask a vector of ints of the core numbers available to this block. */ - void set_processor_affinity(const std::vector<unsigned int> &mask); + void set_processor_affinity(const std::vector<int> &mask); /*! * \brief Unset core affinity. |