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/swig/gr_block.i | |
| parent | 2caaabf8e1dd771174fd42e51c8c8090864638e6 (diff) | |
| parent | 8088f125a9a432de321c62b82755a895d5184080 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-runtime/include/gr_block.h
Diffstat (limited to 'gnuradio-runtime/swig/gr_block.i')
| -rw-r--r-- | gnuradio-runtime/swig/gr_block.i | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/swig/gr_block.i b/gnuradio-runtime/swig/gr_block.i index a80f64d027..a53489f9a2 100644 --- a/gnuradio-runtime/swig/gr_block.i +++ b/gnuradio-runtime/swig/gr_block.i @@ -83,9 +83,9 @@ class gr_block : public gr_basic_block { float pc_work_time_var(); // Methods to manage processor affinity. - void set_processor_affinity(const gr_vector_uint &mask); + void set_processor_affinity(const std::vector<int> &mask); void unset_processor_affinity(); - gr_vector_uint processor_affinity(); + std::vector<int> processor_affinity(); // internal use gr_block_detail_sptr detail () const { return d_detail; } |