Imported Upstream version 3.2.2

[debian/gnuradio] / usrp / host / apps / usrp_cal_dc_offset.cc

diff --git a/usrp/host/apps/usrp_cal_dc_offset.cc b/usrp/host/apps/usrp_cal_dc_offset.cc
index f16191f74b5c0cee9b23a42e093e8db69e389b4e..5ebac12a367b9bb973c5ee28d2a5e08b3dea2bb3 100644 (file)
--- a/usrp/host/apps/usrp_cal_dc_offset.cc
+++ b/usrp/host/apps/usrp_cal_dc_offset.cc
@@ -1,12 +1,12 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2008 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,
@@ -43,7 +43,7 @@ char *prog_name;
 
 
 static void 
-run_cal(usrp_standard_rx *u, int which_side, int decim, bool verbose_p)
+run_cal(usrp_standard_rx_sptr u, int which_side, int decim, bool verbose_p)
 {
   static const int BUFSIZE = u->block_size();
   static const int N = BUFSIZE/sizeof (short);
@@ -213,11 +213,11 @@ main (int argc, char **argv)
   usrp_local_sighandler sigquit (SIGQUIT, usrp_local_sighandler::throw_signal);
 #endif
 
-  usrp_standard_rx *urx =
+  usrp_standard_rx_sptr urx =
     usrp_standard_rx::make(which_board, decim,
                           nchannels, mux, mode,
                           fusb_block_size, fusb_nblocks);
-  if (urx == 0)
+  if (!urx)
     die("usrp_standard_rx::make");
 
   try {
@@ -236,7 +236,5 @@ main (int argc, char **argv)
   catch(...){
     fprintf (stderr, "usrp_cal_dc_offset: caught something\n");
   }
-
-  delete urx;
 }