diff options
author | Tom Rondeau <trondeau@vt.edu> | 2012-03-16 16:57:38 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2012-03-16 16:57:38 -0400 |
commit | fcdac045ad64099949dbbefff25832a6dcef3187 (patch) | |
tree | f0f793f25b942f2f83f2cd754b3b924f9593dfcf /gnuradio-core/src/lib/swig | |
parent | b5dbeb3f02b7e230f0e8fd49640047a04c6908b6 (diff) | |
parent | 74f7c070339a3bb4ba2b6f2e17c66583ba4c0104 (diff) |
Merge branch 'master' into next
Conflicts:
gruel/src/swig/Makefile.am
Diffstat (limited to 'gnuradio-core/src/lib/swig')
-rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index e365aeac7d..972d56c84d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -25,23 +25,7 @@ // SWIG interface definition //////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -// 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"); - } - -} +%include <gruel_common.i> //////////////////////////////////////////////////////////////////////// // Headers |