summaryrefslogtreecommitdiff
path: root/gr-analog/lib/fastnoise_source_X_impl.cc.t
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-04-02 16:02:33 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-02 16:02:33 -0700
commiteea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch)
treeaf3aa889c94cff9c503edefeaf19cb3635693bfb /gr-analog/lib/fastnoise_source_X_impl.cc.t
parente648165dcc7609524681b5eaf9620798b75b8420 (diff)
parent9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff)
Merge branch 'runtime-gruel' into next
Conflicts: gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-analog/lib/fastnoise_source_X_impl.cc.t')
-rw-r--r--gr-analog/lib/fastnoise_source_X_impl.cc.t6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-analog/lib/fastnoise_source_X_impl.cc.t b/gr-analog/lib/fastnoise_source_X_impl.cc.t
index 25ad8073aa..706ddbbf84 100644
--- a/gr-analog/lib/fastnoise_source_X_impl.cc.t
+++ b/gr-analog/lib/fastnoise_source_X_impl.cc.t
@@ -59,7 +59,7 @@ namespace gr {
void
@IMPL_NAME@::set_type(noise_type_t type)
{
- gruel::scoped_lock l(d_setlock);
+ gr::thread::scoped_lock l(d_setlock);
d_type = type;
generate();
}
@@ -67,7 +67,7 @@ namespace gr {
void
@IMPL_NAME@::set_amplitude(float ampl)
{
- gruel::scoped_lock l(d_setlock);
+ gr::thread::scoped_lock l(d_setlock);
d_ampl = ampl;
generate();
}
@@ -123,7 +123,7 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- gruel::scoped_lock l(d_setlock);
+ gr::thread::scoped_lock l(d_setlock);
@TYPE@ *out = (@TYPE@*)output_items[0];