summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Rode <mail@andrejro.de>2018-02-01 13:52:43 +0100
committerMarcus Müller <marcus@hostalia.de>2018-02-06 12:27:50 +0100
commitd85694065af5e87936d409e0626bf5353632aa39 (patch)
tree7767c9cd78d33ac38f65944930c067c6747aba0c
parent57643cfa82184652cff56d91294d3b6f6b3dc96f (diff)
cleanup: remove dynamic exception specifications
Diffstat
-rw-r--r--gnuradio-runtime/swig/hier_block2.i18
-rw-r--r--gnuradio-runtime/swig/top_block.i14
-rw-r--r--gr-audio/lib/alsa/alsa_sink.cc2
-rw-r--r--gr-audio/lib/alsa/alsa_sink.h2
-rw-r--r--gr-audio/lib/alsa/alsa_source.cc2
-rw-r--r--gr-audio/lib/alsa/alsa_source.h2
-rw-r--r--gr-audio/lib/jack/jack_sink.cc2
-rw-r--r--gr-audio/lib/jack/jack_sink.h2
-rw-r--r--gr-audio/lib/jack/jack_source.cc2
-rw-r--r--gr-audio/lib/jack/jack_source.h2
-rw-r--r--gr-audio/lib/portaudio/portaudio_sink.cc2
-rw-r--r--gr-audio/lib/portaudio/portaudio_sink.h2
-rw-r--r--gr-audio/lib/portaudio/portaudio_source.cc2
-rw-r--r--gr-audio/lib/portaudio/portaudio_source.h2
-rw-r--r--gr-filter/include/gnuradio/filter/iir_filter.h3
-rw-r--r--gr-filter/include/gnuradio/filter/pm_remez.h2
-rw-r--r--gr-filter/lib/pm_remez.cc3
17 files changed, 32 insertions, 32 deletions
diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i
index 6e964db8a1..9511471ebc 100644
--- a/gnuradio-runtime/swig/hier_block2.i
+++ b/gnuradio-runtime/swig/hier_block2.i
@@ -34,7 +34,7 @@ namespace gr {
make_hier_block2(const std::string name,
gr::io_signature::sptr input_signature,
gr::io_signature::sptr output_signature)
- throw (std::runtime_error);
+ noexcept(false);
}
// Rename connect and disconnect so that we can more easily build a
@@ -58,28 +58,28 @@ namespace gr {
~hier_block2 ();
void connect(gr::basic_block_sptr block)
- throw (std::invalid_argument);
+ noexcept(false);
void connect(gr::basic_block_sptr src, int src_port,
gr::basic_block_sptr dst, int dst_port)
- throw (std::invalid_argument);
+ noexcept(false);
void msg_connect(gr::basic_block_sptr src, pmt::pmt_t srcport,
gr::basic_block_sptr dst, pmt::pmt_t dstport)
- throw (std::runtime_error);
+ noexcept(false);
void msg_connect(gr::basic_block_sptr src, std::string srcport,
gr::basic_block_sptr dst, std::string dstport)
- throw (std::runtime_error);
+ noexcept(false);
void msg_disconnect(gr::basic_block_sptr src, pmt::pmt_t srcport,
gr::basic_block_sptr dst, pmt::pmt_t dstport)
- throw (std::runtime_error);
+ noexcept(false);
void msg_disconnect(gr::basic_block_sptr src, std::string srcport,
gr::basic_block_sptr dst, std::string dstport)
- throw (std::runtime_error);
+ noexcept(false);
void disconnect(gr::basic_block_sptr block)
- throw (std::invalid_argument);
+ noexcept(false);
void disconnect(gr::basic_block_sptr src, int src_port,
gr::basic_block_sptr dst, int dst_port)
- throw (std::invalid_argument);
+ noexcept(false);
void disconnect_all();
void lock();
void unlock();
diff --git a/gnuradio-runtime/swig/top_block.i b/gnuradio-runtime/swig/top_block.i
index c7ee0af941..6d0632a9a7 100644
--- a/gnuradio-runtime/swig/top_block.i
+++ b/gnuradio-runtime/swig/top_block.i
@@ -37,12 +37,12 @@ namespace gr {
public:
~top_block();
- void start(int max_noutput_items=100000000) throw (std::runtime_error);
+ void start(int max_noutput_items=100000000) noexcept(false);
void stop();
//void wait();
//void run() throw (std::runtime_error);
void lock();
- void unlock() throw (std::runtime_error);
+ void unlock() noexcept(false);
std::string edge_list();
std::string msg_edge_list();
void dump();
@@ -57,7 +57,7 @@ namespace gr {
#ifdef SWIGPYTHON
%inline %{
-void top_block_run_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
+void top_block_run_unlocked(gr::top_block_sptr r) noexcept(false)
{
GR_PYTHON_BLOCKING_CODE
(
@@ -65,7 +65,7 @@ void top_block_run_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
)
}
-void top_block_start_unlocked(gr::top_block_sptr r, int max_noutput_items) throw (std::runtime_error)
+void top_block_start_unlocked(gr::top_block_sptr r, int max_noutput_items) noexcept(false)
{
GR_PYTHON_BLOCKING_CODE
(
@@ -73,7 +73,7 @@ void top_block_start_unlocked(gr::top_block_sptr r, int max_noutput_items) throw
)
}
-void top_block_wait_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
+void top_block_wait_unlocked(gr::top_block_sptr r) noexcept(false)
{
GR_PYTHON_BLOCKING_CODE
(
@@ -81,7 +81,7 @@ void top_block_wait_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
)
}
-void top_block_stop_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
+void top_block_stop_unlocked(gr::top_block_sptr r) noexcept(false)
{
GR_PYTHON_BLOCKING_CODE
(
@@ -89,7 +89,7 @@ void top_block_stop_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
)
}
-void top_block_unlock_unlocked(gr::top_block_sptr r) throw (std::runtime_error)
+void top_block_unlock_unlocked(gr::top_block_sptr r) noexcept(false)
{
GR_PYTHON_BLOCKING_CODE
(
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index f2e70ca2d2..a912b1c3b1 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -538,7 +538,7 @@ namespace gr {
}
void
- alsa_sink::bail(const char *msg, int err) throw (std::runtime_error)
+ alsa_sink::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_alsa_sink");
diff --git a/gr-audio/lib/alsa/alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h
index c1e4670341..27ca047507 100644
--- a/gr-audio/lib/alsa/alsa_sink.h
+++ b/gr-audio/lib/alsa/alsa_sink.h
@@ -71,7 +71,7 @@ namespace gr {
bool d_ok_to_block; // defaults to "true", controls blocking/non-block I/O
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
alsa_sink(int sampling_rate,
diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc
index 2cfc33dd44..d3c9b0f07a 100644
--- a/gr-audio/lib/alsa/alsa_source.cc
+++ b/gr-audio/lib/alsa/alsa_source.cc
@@ -503,7 +503,7 @@ namespace gr {
}
void
- alsa_source::bail(const char *msg, int err) throw (std::runtime_error)
+ alsa_source::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_alsa_source");
diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h
index 88e16932ca..61c50be754 100644
--- a/gr-audio/lib/alsa/alsa_source.h
+++ b/gr-audio/lib/alsa/alsa_source.h
@@ -74,7 +74,7 @@ namespace gr {
int d_nsuspends; // count of suspends
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
alsa_source(int sampling_rate,
diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index 6261545028..b9bb6c82de 100644
--- a/gr-audio/lib/jack/jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -256,7 +256,7 @@ namespace gr {
}
void
- jack_sink::bail(const char *msg, int err) throw (std::runtime_error)
+ jack_sink::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_jack_sink");
diff --git a/gr-audio/lib/jack/jack_sink.h b/gr-audio/lib/jack/jack_sink.h
index eefe5d5b50..23f5d298e5 100644
--- a/gr-audio/lib/jack/jack_sink.h
+++ b/gr-audio/lib/jack/jack_sink.h
@@ -67,7 +67,7 @@ namespace gr {
int d_nunderuns; // count of underruns
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
jack_sink(int sampling_rate,
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index ced1d47d2e..7b610e795a 100644
--- a/gr-audio/lib/jack/jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -256,7 +256,7 @@ namespace gr {
}
void
- jack_source::bail(const char *msg, int err) throw (std::runtime_error)
+ jack_source::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_jack_source");
diff --git a/gr-audio/lib/jack/jack_source.h b/gr-audio/lib/jack/jack_source.h
index 6c895ae067..f40e46d4f0 100644
--- a/gr-audio/lib/jack/jack_source.h
+++ b/gr-audio/lib/jack/jack_source.h
@@ -67,7 +67,7 @@ namespace gr {
int d_noverruns; // count of overruns
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
jack_source(int sampling_rate,
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index 9803559487..942167d9d6 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -368,7 +368,7 @@ namespace gr {
}
void
- portaudio_sink::bail(const char *msg, int err) throw (std::runtime_error)
+ portaudio_sink::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_portaudio_sink");
diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h
index 6327f4397c..d86681036f 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.h
+++ b/gr-audio/lib/portaudio/portaudio_sink.h
@@ -67,7 +67,7 @@ namespace gr {
//gri_logger_sptr d_log; // handle to non-blocking logging instance
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
void create_ringbuffer();
public:
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index 789197472f..f00667fc7f 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -376,7 +376,7 @@ namespace gr {
}
void
- portaudio_source::bail(const char *msg, int err) throw (std::runtime_error)
+ portaudio_source::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_portaudio_source");
diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h
index b42f9a3a9b..7d315c5bc1 100644
--- a/gr-audio/lib/portaudio/portaudio_source.h
+++ b/gr-audio/lib/portaudio/portaudio_source.h
@@ -66,7 +66,7 @@ namespace gr {
int d_noverruns; // count of overruns
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
void create_ringbuffer();
public:
diff --git a/gr-filter/include/gnuradio/filter/iir_filter.h b/gr-filter/include/gnuradio/filter/iir_filter.h
index 0f2b1e58ad..9cc1281514 100644
--- a/gr-filter/include/gnuradio/filter/iir_filter.h
+++ b/gr-filter/include/gnuradio/filter/iir_filter.h
@@ -120,7 +120,7 @@ namespace gr {
iir_filter(const std::vector<tap_type>& fftaps,
const std::vector<tap_type>& fbtaps,
bool oldstyle=true)
- throw (std::invalid_argument)
+ noexcept(false)
{
d_oldstyle = oldstyle;
set_taps(fftaps, fbtaps);
@@ -153,7 +153,6 @@ namespace gr {
*/
void set_taps(const std::vector<tap_type> &fftaps,
const std::vector<tap_type> &fbtaps)
- throw (std::invalid_argument)
{
d_latest_n = 0;
d_latest_m = 0;
diff --git a/gr-filter/include/gnuradio/filter/pm_remez.h b/gr-filter/include/gnuradio/filter/pm_remez.h
index c7e1130d90..cb976cc46d 100644
--- a/gr-filter/include/gnuradio/filter/pm_remez.h
+++ b/gr-filter/include/gnuradio/filter/pm_remez.h
@@ -64,7 +64,7 @@ namespace gr {
const std::vector<double> &error_weight,
const std::string filter_type = "bandpass",
int grid_density = 16
- ) throw (std::runtime_error);
+ ) noexcept(false);
} /* namespace filter */
} /* namespace gr */
diff --git a/gr-filter/lib/pm_remez.cc b/gr-filter/lib/pm_remez.cc
index e55466fd8a..568919a38b 100644
--- a/gr-filter/lib/pm_remez.cc
+++ b/gr-filter/lib/pm_remez.cc
@@ -776,7 +776,8 @@ namespace gr {
const std::vector<double> &arg_weight,
const std::string filter_type,
int grid_density
- ) throw (std::runtime_error)
+ )
+ noexcept(false)
{
int numtaps = order + 1;
if(numtaps < 4)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 11:53:39 +0000