Merge branch 'maint' of https://github.com/guruofquality/gnuradio into v3.6.4git_gras_support

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

2 files changed, 18 insertions, 2 deletions

diff --git a/gr-analog/lib/noise_source_X_impl.cc.t b/gr-analog/lib/noise_source_X_impl.cc.t
index 35dda9c5d..40e2517d2 100644
--- a/gr-analog/lib/noise_source_X_impl.cc.t
+++ b/gr-analog/lib/noise_source_X_impl.cc.t
@@ -54,11 +54,27 @@ namespace gr {
     {
     }
 
+    void
+    @IMPL_NAME@::set_type(noise_type_t type)
+    {
+      gruel::scoped_lock l(d_setlock);
+      d_type = type;
+    }
+
+    void
+    @IMPL_NAME@::set_amplitude(float ampl)
+    {
+      gruel::scoped_lock l(d_setlock);
+      d_ampl = ampl;
+    }
+
     int
     @IMPL_NAME@::work(int noutput_items,
 		      gr_vector_const_void_star &input_items,
 		      gr_vector_void_star &output_items)
     {
+      gruel::scoped_lock l(d_setlock);
+
       @TYPE@ *out = (@TYPE@*)output_items[0];
 
       switch(d_type) {
diff --git a/gr-analog/lib/noise_source_X_impl.h.t b/gr-analog/lib/noise_source_X_impl.h.t
index 8bcc1dfde..3a0e8d6d7 100644
--- a/gr-analog/lib/noise_source_X_impl.h.t
+++ b/gr-analog/lib/noise_source_X_impl.h.t
@@ -41,8 +41,8 @@ namespace gr {
       @IMPL_NAME@(noise_type_t type, float ampl, long seed = 0);
       ~@IMPL_NAME@();
 
-      void set_type(noise_type_t type) { d_type = type; }
-      void set_amplitude(float ampl) { d_ampl = ampl; }
+      void set_type(noise_type_t type);
+      void set_amplitude(float ampl);
 
       noise_type_t type() const { return d_type; }
       float amplitude() const { return d_ampl; }