summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorJosh Blum2011-09-28 23:03:30 -0700
committerJosh Blum2011-09-28 23:03:30 -0700
commit74ec2b60cc48dacca26f7dbf4f9ca9110ac9b53a (patch)
treecaf1a259e5be9c702d40d9ad75294c162ca4aa55 /gnuradio-core
parent9e73c4e8372bc581d686d5e82a808894d41523ec (diff)
parent21e9139fb2ec13ec38287b36d6399c12b00b37c6 (diff)
downloadgnuradio-74ec2b60cc48dacca26f7dbf4f9ca9110ac9b53a.tar.gz
gnuradio-74ec2b60cc48dacca26f7dbf4f9ca9110ac9b53a.tar.bz2
gnuradio-74ec2b60cc48dacca26f7dbf4f9ca9110ac9b53a.zip
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/lib/swig/gnuradio.i18
1 files changed, 18 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i
index 1856d5007..e365aeac7 100644
--- a/gnuradio-core/src/lib/swig/gnuradio.i
+++ b/gnuradio-core/src/lib/swig/gnuradio.i
@@ -26,6 +26,24 @@
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
+// Language independent exception handler
+////////////////////////////////////////////////////////////////////////
+%include exception.i
+
+%exception {
+ try {
+ $action
+ }
+ catch(std::exception &e) {
+ SWIG_exception(SWIG_RuntimeError, e.what());
+ }
+ catch(...) {
+ SWIG_exception(SWIG_RuntimeError, "Unknown exception");
+ }
+
+}
+
+////////////////////////////////////////////////////////////////////////
// Headers
%{