diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-12 19:09:44 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-12 19:09:44 -0500 |
| commit | 5e16d322b03fe97dedbe718d8dc04017ddbd58cc (patch) | |
| tree | 6bd6a59dfa35f590555d60654d8313c75656dfab /gnuradio-core | |
| parent | c15a2c6f4f720265a7ed89c51224c9184a8ae512 (diff) | |
| parent | 5e98721cb56d10d38ea65aa405399e2f9c4e6056 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.i | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_types.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.i b/gnuradio-core/src/lib/runtime/gr_block.i index 0a2fb61f46..c016f2c28e 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.i +++ b/gnuradio-core/src/lib/runtime/gr_block.i @@ -76,9 +76,9 @@ class gr_block : public gr_basic_block { float pc_work_time(); // Methods to manage processor affinity. - void set_processor_affinity(const std::vector<unsigned int> &mask); + void set_processor_affinity(const gr_vector_uint &mask); void unset_processor_affinity(); - std::vector<unsigned int> processor_affinity(); + gr_vector_uint processor_affinity(); // internal use gr_block_detail_sptr detail () const { return d_detail; } diff --git a/gnuradio-core/src/lib/runtime/gr_types.h b/gnuradio-core/src/lib/runtime/gr_types.h index ad6cee7682..db13e456aa 100644 --- a/gnuradio-core/src/lib/runtime/gr_types.h +++ b/gnuradio-core/src/lib/runtime/gr_types.h @@ -31,6 +31,7 @@ #include <gr_complex.h> typedef std::vector<int> gr_vector_int; +typedef std::vector<unsigned int> gr_vector_uint; typedef std::vector<float> gr_vector_float; typedef std::vector<double> gr_vector_double; typedef std::vector<void *> gr_vector_void_star; |