diff options
| author | eb | 2007-08-31 01:59:32 +0000 |
|---|---|---|
| committer | eb | 2007-08-31 01:59:32 +0000 |
| commit | 415910cb8d48e33edf3289e2ba7b4a7b7f352cdd (patch) | |
| tree | 1da3b09a6ab93eba7df34ec123f390bafef84037 /gnuradio-core/src/lib/general | |
| parent | 36999d9a501bec0a02568a2a739a0a94ab1cf8ad (diff) | |
| download | gnuradio-415910cb8d48e33edf3289e2ba7b4a7b7f352cdd.tar.gz gnuradio-415910cb8d48e33edf3289e2ba7b4a7b7f352cdd.tar.bz2 gnuradio-415910cb8d48e33edf3289e2ba7b4a7b7f352cdd.zip | |
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
Diffstat (limited to 'gnuradio-core/src/lib/general')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_firdes.cc | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_firdes.i | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/general/gr_firdes.cc b/gnuradio-core/src/lib/general/gr_firdes.cc index 7b449af95..06730b7f8 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 7674d6b45..6fbe27f67 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); }; |