BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SWIG: Define "noexcept" empty to work around SWIG bug 

The SWIG 2.0.12 on my system bails out with a syntax error on the
"noexcept" keyword in C++11 code. Define "noexcept" to nothing (for
the SWIG parser only) to work around this problem.
This commit is contained in:
Daniel Elstner 2015-10-11 12:12:28 +02:00
parent 6c11b49607
commit c6e18e007a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -651,7 +651,7 @@ $(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i
$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \ $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
-$(AM_V_at)rm -f $(java_cleanfiles) -$(AM_V_at)rm -f $(java_cleanfiles)
$(AM_V_GEN)$(SWIG) -c++ -java -package org.sigrok.core.classes \ $(AM_V_GEN)$(SWIG) -c++ -Dnoexcept= -java -package org.sigrok.core.classes \
-Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \ -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
-outdir $(JCLS) -o $@ $(srcdir)/$(JSWG) -outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)

4
bindings/python/setup.py
View File

@ -87,8 +87,8 @@ setup(
ext_modules = [ ext_modules = [
Extension('sigrok.core._classes', Extension('sigrok.core._classes',
sources = [vpath('sigrok/core/classes.i')], sources = [vpath('sigrok/core/classes.i')],
swig_opts = ['-c++', '-threads', '-Isigrok/core', '-I..', '-I' + srcdir_parent] + swig_opts = ['-c++', '-threads', '-Dnoexcept=', '-Isigrok/core',
['-I%s' % i for i in includes], '-I..', '-I' + srcdir_parent] + ['-I%s' % i for i in includes],
extra_compile_args = ['-Wno-uninitialized'], extra_compile_args = ['-Wno-uninitialized'],
include_dirs = includes, include_dirs = includes,
library_dirs = libdirs, library_dirs = libdirs,