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_stream_mux.cc
diff --git
a/gnuradio-core/src/lib/general/gr_stream_mux.cc
b/gnuradio-core/src/lib/general/gr_stream_mux.cc
index 06556b583674214f9fd2157fb5211bdcf1df4397..7ef2bb3c7b95f30deec68028c0b86d8eaec4c16b 100644
(file)
--- a/
gnuradio-core/src/lib/general/gr_stream_mux.cc
+++ b/
gnuradio-core/src/lib/general/gr_stream_mux.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-34,7
+34,7
@@
gr_stream_mux_sptr
gr_make_stream_mux (size_t itemsize, const std::vector<int> &lengths)
{
gr_stream_mux_sptr
gr_make_stream_mux (size_t itemsize, const std::vector<int> &lengths)
{
- return g
r_stream_mux_sptr
(new gr_stream_mux (itemsize, lengths));
+ return g
nuradio::get_initial_sptr
(new gr_stream_mux (itemsize, lengths));
}
gr_stream_mux::gr_stream_mux (size_t itemsize, const std::vector<int> &lengths)
}
gr_stream_mux::gr_stream_mux (size_t itemsize, const std::vector<int> &lengths)