summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorJohnathan Corgan2012-11-02 09:43:58 -0700
committerJohnathan Corgan2012-11-02 09:43:58 -0700
commit747b6702a112ccb4644904e1c965221c2de157f8 (patch)
treeecc55f514c7cf1a55c0f1677f847bf30b20854fd /gnuradio-core
parent58ebe83ee38e45a80ace777a070d2c1fa1ab1df8 (diff)
parentc5436ca8ddab5fa77a585c8f00743bb85a93c59a (diff)
downloadgnuradio-747b6702a112ccb4644904e1c965221c2de157f8.tar.gz
gnuradio-747b6702a112ccb4644904e1c965221c2de157f8.tar.bz2
gnuradio-747b6702a112ccb4644904e1c965221c2de157f8.zip
Merge branch 'maint'
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/lib/hier/gr_channel_model.h2
-rw-r--r--gnuradio-core/src/lib/hier/gr_channel_model.i2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.h b/gnuradio-core/src/lib/hier/gr_channel_model.h
index 3f289e320..f0b31b1a6 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.h
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.h
@@ -36,7 +36,7 @@ GR_CORE_API gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0
double frequency_offset=0.0,
double epsilon=1.0,
const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
- double noise_seed=3021);
+ double noise_seed=0);
/*!
* \brief channel simulator
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.i b/gnuradio-core/src/lib/hier/gr_channel_model.i
index 24a9388e5..9aa6ebf5b 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.i
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.i
@@ -26,7 +26,7 @@ gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
double frequency_offset=0.0,
double epsilon=1.0,
const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
- double noise_seed=3021);
+ double noise_seed=0);
class gr_channel_model : public gr_hier_block2
{