Merged in misc_fixes branch.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10350 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
index 13d87e765af36ebf585b644adce9b5a8f6c05640..ba4e4eec1c670fecb0a2800db6de8107f3bb8e04 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
@@ -44,9 +44,10 @@ protected:
 
   // Override to calculate new weight from old, corresponding input
   virtual void update_tap(float &tap, const gr_complex &in) = 0;
-  
-public:
+
   gr_adaptive_fir_ccf(const char *name, int decimation, const std::vector<float> &taps);
+
+public:
   void set_taps(const std::vector<float> &taps);
 
   int work(int noutput_items,

diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i
index 90132f2d57d3418f3e295d63390decdbf346f51a..c73c780450ab30d6b01b673ffc95407011b7dd17 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.i
@@ -22,7 +22,7 @@
 
 class gr_adaptive_fir_ccf : public gr_sync_decimator
 {
-private:
+protected:
   gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> &taps);
 
 public:

diff --git a/gnuradio-core/src/lib/gengen/gengen.i b/gnuradio-core/src/lib/gengen/gengen.i
index 420b8ef5e2dc39e04f8a0b7016a63bd49839e9aa..c3827288ec9f029c8917afecd160ee5fd9bf0d9b 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gengen.i
+++ b/gnuradio-core/src/lib/gengen/gengen.i
@@ -1,3 +1,25 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * 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., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
 %{
 #include "gr_endianness.h"
 #include "gr_sig_source_waveform.h"

diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
index 68dbfd6456dd06504254000c6f637d8fd952f6e3..254a7a940c2ea0b276dbd3efa8f81f4b80453587 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i
+++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
@@ -39,7 +39,7 @@ class gr_msg_queue : public gr_msg_handler {
   int                  d_count;
 
 public:
-  gr_msg_queue();
+  gr_msg_queue(unsigned int limit);
   ~gr_msg_queue();
 
   //! Generic msg_handler method: insert the message.
@@ -87,7 +87,7 @@ public:
  * functions into the gr.msg_queue wrapper class, so that everything
  * appears normal.  (An evil laugh is heard in the distance...)
  */
-%inline {
+%inline %{
   gr_message_sptr gr_py_msg_queue__delete_head(gr_msg_queue_sptr q) {
     gr_message_sptr msg;
     Py_BEGIN_ALLOW_THREADS;            // release global interpreter lock
@@ -101,7 +101,7 @@ public:
     q->insert_tail(msg);               // possibly blocking call
     Py_END_ALLOW_THREADS;              // acquire global interpreter lock
   }
-}
+%}
 
 // smash in new python delete_head and insert_tail methods...
 %pythoncode %{

diff --git a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i b/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i
index fb2ff0d7f2464bf9faf0e0ba9ccd76085d3b8374..5e9032449a66decc5b51f4335e6961c78f5c37b3 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i
+++ b/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i
@@ -42,11 +42,10 @@ class gr_single_threaded_scheduler {
   gr_single_threaded_scheduler (const std::vector<gr_block_sptr> &modules);
 };
 
-%inline {
+%inline %{
   void sts_pyrun (gr_single_threaded_scheduler_sptr s) {
     Py_BEGIN_ALLOW_THREADS;            // release global interpreter lock
     s->run ();
     Py_END_ALLOW_THREADS;              // acquire global interpreter lock
   }
-}
-
+%}

diff --git a/gnuradio-core/src/lib/swig/sw_filter.i b/gnuradio-core/src/lib/swig/sw_filter.i
index e4553ed92ea4f7ed693b1054883b6f5812204a64..d28bddd40480c29ee4e3a071b897b9b04f9a6cb7 100644 (file)
--- a/gnuradio-core/src/lib/swig/sw_filter.i
+++ b/gnuradio-core/src/lib/swig/sw_filter.i
@@ -5,16 +5,16 @@
  * 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 Filter Public License as published by
+ * it under the terms of the GNU General Public License as published by
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Filter Public License for more details.
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU Filter Public License along
+ * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */

diff --git a/gnuradio-core/src/lib/swig/sw_io.i b/gnuradio-core/src/lib/swig/sw_io.i
index d416370009fe8a535ec030192febc40db6d94139..acbe1adbe146b0d4b533db783fa5b98835e42342 100644 (file)
--- a/gnuradio-core/src/lib/swig/sw_io.i
+++ b/gnuradio-core/src/lib/swig/sw_io.i
@@ -5,16 +5,16 @@
  * 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 Io Public License as published by
+ * it under the terms of the GNU General Public License as published by
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Io Public License for more details.
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU Io Public License along
+ * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */