[Commit-gnuradio] r10485 - gnuradio/branches/releases/3.2/gr-msdd6000/src

[jcorgan]

Author: jcorgan
Date: 2009-02-23 15:09:49 -0700 (Mon, 23 Feb 2009)
New Revision: 10485

Modified:
   gnuradio/branches/releases/3.2/gr-msdd6000/src/Makefile.am
   gnuradio/branches/releases/3.2/gr-msdd6000/src/msdd6000.cc
Log:
Merged r10411:10412 from trunk into release 3.2 branch

Modified: gnuradio/branches/releases/3.2/gr-msdd6000/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gr-msdd6000/src/Makefile.am  2009-02-23 
22:03:22 UTC (rev 10484)
+++ gnuradio/branches/releases/3.2/gr-msdd6000/src/Makefile.am  2009-02-23 
22:09:49 UTC (rev 10485)
@@ -80,10 +80,11 @@
 # link the library against some comon swig runtime code and the 
 # c++ standard library
 _msdd_la_LIBADD =                      \
+       $(GNURADIO_CORE_LA)             \
        $(PYTHON_LDFLAGS)               \
        -lstdc++
-# -L/usr/lib/libfftw3f.so.3.1.2
 
+
 msdd.cc msdd.py: $(ALL_IFILES) 
        $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module msdd \
                -o msdd.cc $(LOCAL_IFILES)

Modified: gnuradio/branches/releases/3.2/gr-msdd6000/src/msdd6000.cc
===================================================================
--- gnuradio/branches/releases/3.2/gr-msdd6000/src/msdd6000.cc  2009-02-23 
22:03:22 UTC (rev 10484)
+++ gnuradio/branches/releases/3.2/gr-msdd6000/src/msdd6000.cc  2009-02-23 
22:09:49 UTC (rev 10485)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -84,7 +84,12 @@
        d_state = STATE_STOPPED;
 }
 
+MSDD6000::~MSDD6000()
+{
+  // NOP
+}
 
+
 static void
 optimize_socket(int socket){
 #define BANDWIDTH      1000000000/8