[Commit-gnuradio] r6236 - gnuradio/trunk/gnuradio-core/src/lib/general

[eb]

Author: eb
Date: 2007-08-30 19:59:32 -0600 (Thu, 30 Aug 2007)
New Revision: 6236

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i
Log:
Attempt to simplify conditions for ticket:181.  Didn't fix problem, but
didn't harm anything either.


Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.cc   2007-08-30 
21:51:22 UTC (rev 6235)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.cc   2007-08-31 
01:59:32 UTC (rev 6236)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2002 Free Software Foundation, Inc.
+ * Copyright 2002,2007 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -518,7 +518,7 @@
 
 #endif
   default:
-    throw std::runtime_error ("not_implemented");
+    throw std::out_of_range ("gr_firdes:window: type out of range");
   }
 
   return taps;

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i    2007-08-30 
21:51:22 UTC (rev 6235)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i    2007-08-31 
01:59:32 UTC (rev 6236)
@@ -40,7 +40,7 @@
            double transition_width,    // Hz width of transition band
            win_type window = WIN_HAMMING,
            double beta = 6.76          // used only with Kaiser
-           ) throw(std::out_of_range, std::runtime_error);
+           ) throw(std::out_of_range);
 
   /*!
    * \brief use "window method" to design a high-pass FIR filter
@@ -63,7 +63,7 @@
             double transition_width,           // Hz width of transition band
             win_type window = WIN_HAMMING,
             double beta = 6.76                 // used only with Kaiser
-            ) throw(std::out_of_range, std::runtime_error); 
+            ) throw(std::out_of_range); 
 
   /*!
    * \brief use "window method" to design a band-pass FIR filter
@@ -88,7 +88,7 @@
             double transition_width,           // Hz width of transition band
             win_type window = WIN_HAMMING,
             double beta = 6.76                 // used only with Kaiser
-            ) throw(std::out_of_range, std::runtime_error); 
+            ) throw(std::out_of_range); 
 
 
   /*!
@@ -115,7 +115,7 @@
             double transition_width,           // Hz width of transition band
             win_type window = WIN_HAMMING,     // used only with Kaiser
             double beta = 6.76
-            ) throw(std::out_of_range, std::runtime_error); 
+            ) throw(std::out_of_range); 
 
 
   /*!
@@ -142,7 +142,7 @@
               double transition_width,         // Hz width of transition band
               win_type window = WIN_HAMMING,   // used only with Kaiser
               double beta = 6.76
-              ) throw(std::out_of_range, std::runtime_error);
+              ) throw(std::out_of_range);
 
   /*!\brief design a Hilbert Transform Filter
    *
@@ -154,7 +154,7 @@
   hilbert (unsigned int ntaps = 19,
           win_type windowtype = WIN_RECTANGULAR,
           double beta = 6.76
-          ) throw(std::out_of_range, std::runtime_error);
+          ) throw(std::out_of_range);
    
   /*!
    * \brief design a Root Cosine FIR Filter (do we need a window?)
@@ -190,5 +190,5 @@
    * Return window given type, ntaps and optional beta.
    */
   static std::vector<float> gr_firdes::window (win_type type, int ntaps, 
double beta) 
-    throw(std::runtime_error, std::runtime_error);
+    throw(std::runtime_error);
 };