Merge branch 'maint' into v3.6.4git_gras_support

Conflicts:
	gnuradio-core/src/lib/runtime/gr_block.cc
	gnuradio-core/src/lib/runtime/gr_block.h

6 files changed, 10 insertions, 10 deletions

diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h
index 6919b204e..c3898a5c0 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_block.h
@@ -328,14 +328,14 @@ struct GR_CORE_API gr_block : gras::Block
 
   // ----------------------------------------------------------------------------
   // Functions to handle thread affinity
-  std::vector<unsigned int> d_affinity;              // thread affinity proc. mask
+  std::vector<int> d_affinity;              // thread affinity proc. mask
 
   /*!
    * \brief Set the thread's affinity to processor core \p n.
    *
    * \param mask a vector of unsigned ints of the core numbers available to this block.
    */
-  void set_processor_affinity(const std::vector<unsigned int> &mask){d_affinity=mask;}
+  void set_processor_affinity(const std::vector<int> &mask){d_affinity=mask;}
 
   /*!
    * \brief Remove processor affinity to a specific core.
@@ -345,7 +345,7 @@ struct GR_CORE_API gr_block : gras::Block
   /*!
    * \brief Get the current processor affinity.
    */
-  std::vector<unsigned int> processor_affinity() { return d_affinity; }
+  std::vector<int> processor_affinity() { return d_affinity; }
 
     ///////////////// private vars //////////////////////
 
diff --git a/gnuradio-core/src/lib/runtime/gr_block.i b/gnuradio-core/src/lib/runtime/gr_block.i
index a80f64d02..a53489f9a 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.i
+++ b/gnuradio-core/src/lib/runtime/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; }
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.cc b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
index 82081039a..af80e61cf 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
@@ -215,7 +215,7 @@ gr_block_detail::get_tags_in_range(std::vector<gr_tag_t> &v,
 }
 
 void
-gr_block_detail::set_processor_affinity(const std::vector<unsigned int> &mask)
+gr_block_detail::set_processor_affinity(const std::vector<int> &mask)
 {
   if(threaded) {
     try {
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.h b/gnuradio-core/src/lib/runtime/gr_block_detail.h
index 32a01e763..15d85135a 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.h
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.h
@@ -159,9 +159,9 @@ class GR_CORE_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.
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc b/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
index 1d3dafadf..6bbc9ceb8 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
+++ b/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
@@ -269,7 +269,7 @@ void qa_gr_top_block::t11_set_block_affinity()
   gr_block_sptr src (gr_make_null_source(sizeof(float)));
   gr_block_sptr snk (gr_make_null_sink(sizeof(float)));
 
-  std::vector<unsigned int> set(1, 0), ret;
+  std::vector<int> set(1, 0), ret;
   src->set_processor_affinity(set);
 
   tb->connect(src, 0, snk, 0);
diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-core/src/lib/runtime/runtime.i
index 935b43742..2da3f40a4 100644
--- a/gnuradio-core/src/lib/runtime/runtime.i
+++ b/gnuradio-core/src/lib/runtime/runtime.i
@@ -67,7 +67,7 @@
 
 //the bare minimum block inheritance interface to make things work but keep swig cxx file size down
 %include <gras/gras.hpp>
-%include <gras/element.hpp>
+%import <gras/element.i>
 namespace gras
 {
     struct Block : gras::Element{};