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

SWIG: Avoid unseparated template closing brackets 

SWIG 2.0.12 fails with a syntax error on ">>".
This commit is contained in:
Daniel Elstner 2015-10-26 05:47:21 +01:00
parent 4aa9a1e569
commit b0b0e2009c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/java/org/sigrok/core/classes/classes.i
View File

@ -198,11 +198,11 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>, MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
ConfigKey, java.util.Set<Capability>) ConfigKey, java.util.Set<Capability>)
%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability>> "jobject" %typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > "jobject"
%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability>> %typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >
"java.util.Map<ConfigKey,java.util.Set<Capability>>" "java.util.Map<ConfigKey,java.util.Set<Capability>>"
%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability>> { %typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > {
jclass HashMap = jenv->FindClass("java/util/HashMap"); jclass HashMap = jenv->FindClass("java/util/HashMap");
jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V"); jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put", jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",