Merge commit 'v3.3.1' into try-3.3.1

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_fake_channel_coder_pp.cc

diff --git a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
index 0ef4c46dbebb40e41e39543c8d038a816fd59526..24945cfd8a459ee5a9acefb8af17cf5ec0e6166e 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
+++ b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc
@@ -1,12 +1,12 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -28,13 +28,14 @@
 #include <gr_io_signature.h>
 #include <string.h>
 #include <stdexcept>
+#include <string.h>
 
 static const int PAD_VAL = 0xAA;
 
 gr_fake_channel_encoder_pp_sptr
 gr_make_fake_channel_encoder_pp(int input_vlen, int output_vlen)
 {
-  return gr_fake_channel_encoder_pp_sptr(new gr_fake_channel_encoder_pp(input_vlen,
+  return gnuradio::get_initial_sptr(new gr_fake_channel_encoder_pp(input_vlen,
                                                                        output_vlen));
 }
 
@@ -76,7 +77,7 @@ gr_fake_channel_encoder_pp::work (int noutput_items,
 gr_fake_channel_decoder_pp_sptr
 gr_make_fake_channel_decoder_pp(int input_vlen, int output_vlen)
 {
-  return gr_fake_channel_decoder_pp_sptr(new gr_fake_channel_decoder_pp(input_vlen,
+  return gnuradio::get_initial_sptr(new gr_fake_channel_decoder_pp(input_vlen,
                                                                        output_vlen));
 }