projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.1' into try-3.3.1
[debian/gnuradio]
/
gnuradio-core
/
src
/
lib
/
general
/
gr_descrambler_bb.cc
diff --git
a/gnuradio-core/src/lib/general/gr_descrambler_bb.cc
b/gnuradio-core/src/lib/general/gr_descrambler_bb.cc
index e173a8a22598538ecb062978e396dc36871c69e8..b712e69edaa0b27928dd987098e3f6f8bce618fa 100644
(file)
--- a/
gnuradio-core/src/lib/general/gr_descrambler_bb.cc
+++ b/
gnuradio-core/src/lib/general/gr_descrambler_bb.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-30,7
+30,7
@@
gr_descrambler_bb_sptr
gr_make_descrambler_bb(int mask, int seed, int len)
{
gr_descrambler_bb_sptr
gr_make_descrambler_bb(int mask, int seed, int len)
{
- return g
r_descrambler_bb
_sptr(new gr_descrambler_bb(mask, seed, len));
+ return g
nuradio::get_initial
_sptr(new gr_descrambler_bb(mask, seed, len));
}
gr_descrambler_bb::gr_descrambler_bb(int mask, int seed, int len)
}
gr_descrambler_bb::gr_descrambler_bb(int mask, int seed, int len)