From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 31 Aug 2007 01:59:32 +0000 (+0000)
Subject: Attempt to simplify conditions for ticket:181.  Didn't fix problem, but
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=415910cb8d48e33edf3289e2ba7b4a7b7f352cdd;p=debian%2Fgnuradio

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 7b449af9..06730b7f 100644
--- 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 7674d6b4..6fbe27f6 100644
--- 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);
 };