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_complex_to_interleaved_short.cc
diff --git
a/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.cc
b/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.cc
index fcecf0c8b35adca371b747e5aa7529840a72beeb..d198da0b038eb798b221aa706ca515db57dfc324 100644
(file)
--- a/
gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.cc
+++ b/
gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2004,2005 Free Software Foundation, Inc.
+ * Copyright 2004,2005
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-31,7
+31,7
@@
gr_complex_to_interleaved_short_sptr
gr_make_complex_to_interleaved_short ()
{
gr_complex_to_interleaved_short_sptr
gr_make_complex_to_interleaved_short ()
{
- return g
r_complex_to_interleaved_short_sptr
(new gr_complex_to_interleaved_short ());
+ return g
nuradio::get_initial_sptr
(new gr_complex_to_interleaved_short ());
}
gr_complex_to_interleaved_short::gr_complex_to_interleaved_short ()
}
gr_complex_to_interleaved_short::gr_complex_to_interleaved_short ()