summaryrefslogtreecommitdiff
path: root/gnuradio-core/src
diff options
context:
space:
mode:
authorJohnathan Corgan2011-09-27 10:32:41 -0700
committerJohnathan Corgan2011-09-27 10:32:41 -0700
commit21e9139fb2ec13ec38287b36d6399c12b00b37c6 (patch)
treea7540aaf25d3be99d2d07d43eaa09ef70f6fa31d /gnuradio-core/src
parente3b56bfd879f16c2fa1f284f330ed3df6a211ec1 (diff)
parentcb23b7a23ca8a1b1331e3d70e97425b1d52b2222 (diff)
downloadgnuradio-21e9139fb2ec13ec38287b36d6399c12b00b37c6.tar.gz
gnuradio-21e9139fb2ec13ec38287b36d6399c12b00b37c6.tar.bz2
gnuradio-21e9139fb2ec13ec38287b36d6399c12b00b37c6.zip
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src')
-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
%{