Attempt to simplify conditions for ticket:181. Didn't fix problem, but

didn't harm anything either.

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

diff --git a/gnuradio-core/src/lib/general/gr_firdes.cc b/gnuradio-core/src/lib/general/gr_firdes.cc
index 7b449af95dd6f83bbc5d5c1458690a8bbfd1b20f..06730b7f8d1fcaf1a039168555aeb73268be2fa4 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_firdes.cc
+++ b/gnuradio-core/src/lib/general/gr_firdes.cc
@@ -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 @@ gr_firdes::window (win_type type, int ntaps, double beta)
 
 #endif
   default:
-    throw std::runtime_error ("not_implemented");
+    throw std::out_of_range ("gr_firdes:window: type out of range");
   }
 
   return taps;

diff --git a/gnuradio-core/src/lib/general/gr_firdes.i b/gnuradio-core/src/lib/general/gr_firdes.i
index 7674d6b45809280f22e8658cdc13527bcadc6e4f..6fbe27f674240a960d6c42358b085985eba5fb6f 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_firdes.i
+++ b/gnuradio-core/src/lib/general/gr_firdes.i
@@ -40,7 +40,7 @@ class gr_firdes {
            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 @@ class gr_firdes {
             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 @@ class gr_firdes {
             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 @@ class gr_firdes {
             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 @@ class gr_firdes {
               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 @@ class gr_firdes {
   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 @@ class gr_firdes {
    * 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);
 };