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_simple_framer.cc
diff --git
a/gnuradio-core/src/lib/general/gr_simple_framer.cc
b/gnuradio-core/src/lib/general/gr_simple_framer.cc
index d2de0954627bcf886412ce81f810a47b8aba62fd..2a574a74e48a7af6fb918ed944bd0dfb391bc64e 100644
(file)
--- a/
gnuradio-core/src/lib/general/gr_simple_framer.cc
+++ b/
gnuradio-core/src/lib/general/gr_simple_framer.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-35,7
+35,7
@@
gr_simple_framer_sptr
gr_make_simple_framer (int payload_bytesize)
{
gr_simple_framer_sptr
gr_make_simple_framer (int payload_bytesize)
{
- return g
r_simple_framer_sptr
(new gr_simple_framer (payload_bytesize));
+ return g
nuradio::get_initial_sptr
(new gr_simple_framer (payload_bytesize));
}
gr_simple_framer::gr_simple_framer (int payload_bytesize)
}
gr_simple_framer::gr_simple_framer (int payload_bytesize)