diff options
| author | eb | 2007-08-21 19:15:43 +0000 |
|---|---|---|
| committer | eb | 2007-08-21 19:15:43 +0000 |
| commit | 8c9188a05a0334e59553ded02052dc1ecb67feb6 (patch) | |
| tree | ff89f0539395e4a650fd8df5d0f29852d5653e6e | |
| parent | d404d01943acb9b8c929b3203c73a4c139466205 (diff) | |
| download | gnuradio-8c9188a05a0334e59553ded02052dc1ecb67feb6.tar.gz gnuradio-8c9188a05a0334e59553ded02052dc1ecb67feb6.tar.bz2 gnuradio-8c9188a05a0334e59553ded02052dc1ecb67feb6.zip | |
fix for ticket:153, missing throw decl in .i file
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6161 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_firdes.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_firdes.i | 26 |
2 files changed, 17 insertions, 11 deletions
diff --git a/gnuradio-core/src/lib/general/gr_firdes.h b/gnuradio-core/src/lib/general/gr_firdes.h index 831c0ee68..2a1d6e70a 100644 --- a/gnuradio-core/src/lib/general/gr_firdes.h +++ b/gnuradio-core/src/lib/general/gr_firdes.h @@ -172,7 +172,7 @@ class gr_firdes { * \p beta: Only used for Kaiser */ static std::vector<float> - hilbert (unsigned int ntaps, + hilbert (unsigned int ntaps = 19, win_type windowtype = WIN_RECTANGULAR, double beta = 6.76); diff --git a/gnuradio-core/src/lib/general/gr_firdes.i b/gnuradio-core/src/lib/general/gr_firdes.i index 71f0b4ed7..7674d6b45 100644 --- a/gnuradio-core/src/lib/general/gr_firdes.i +++ b/gnuradio-core/src/lib/general/gr_firdes.i @@ -39,7 +39,8 @@ class gr_firdes { double cutoff_freq, // Hz center of transition band double transition_width, // Hz width of transition band win_type window = WIN_HAMMING, - double beta = 6.76) throw(std::out_of_range); // used only with Kaiser + double beta = 6.76 // used only with Kaiser + ) throw(std::out_of_range, std::runtime_error); /*! * \brief use "window method" to design a high-pass FIR filter @@ -61,7 +62,8 @@ class gr_firdes { double cutoff_freq, // Hz center of transition band double transition_width, // Hz width of transition band win_type window = WIN_HAMMING, - double beta = 6.76) throw(std::out_of_range); // used only with Kaiser + double beta = 6.76 // used only with Kaiser + ) throw(std::out_of_range, std::runtime_error); /*! * \brief use "window method" to design a band-pass FIR filter @@ -85,7 +87,8 @@ class gr_firdes { double high_cutoff_freq, // Hz center of transition band double transition_width, // Hz width of transition band win_type window = WIN_HAMMING, - double beta = 6.76) throw(std::out_of_range); // used only with Kaiser + double beta = 6.76 // used only with Kaiser + ) throw(std::out_of_range, std::runtime_error); /*! @@ -110,8 +113,9 @@ class gr_firdes { double low_cutoff_freq, // Hz center of transition band double high_cutoff_freq, // Hz center of transition band double transition_width, // Hz width of transition band - win_type window = WIN_HAMMING, - double beta = 6.76) throw(std::out_of_range); // used only with Kaiser + win_type window = WIN_HAMMING, // used only with Kaiser + double beta = 6.76 + ) throw(std::out_of_range, std::runtime_error); /*! @@ -136,8 +140,9 @@ class gr_firdes { double low_cutoff_freq, // Hz center of transition band double high_cutoff_freq, // Hz center of transition band double transition_width, // Hz width of transition band - win_type window = WIN_HAMMING, - double beta = 6.76) throw(std::out_of_range); // used only with Kaiser + win_type window = WIN_HAMMING, // used only with Kaiser + double beta = 6.76 + ) throw(std::out_of_range, std::runtime_error); /*!\brief design a Hilbert Transform Filter * @@ -146,9 +151,10 @@ class gr_firdes { * \p beta: Only used for Kaiser */ static std::vector<float> - hilbert (unsigned int ntaps, + hilbert (unsigned int ntaps = 19, win_type windowtype = WIN_RECTANGULAR, - double beta = 6.76) throw(std::out_of_range); + double beta = 6.76 + ) throw(std::out_of_range, std::runtime_error); /*! * \brief design a Root Cosine FIR Filter (do we need a window?) @@ -184,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); + throw(std::runtime_error, std::runtime_error); }; |