From: Daniel Elstner Date: Mon, 26 Oct 2015 04:47:21 +0000 (+0100) Subject: SWIG: Avoid unseparated template closing brackets X-Git-Tag: libsigrok-0.4.0~153 X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=b0b0e2009cae6b1e85992acb5213944aeff5fb53;hp=4aa9a1e5698c74e2295f52313c33804761176fc1;p=libsigrok.git SWIG: Avoid unseparated template closing brackets SWIG 2.0.12 fails with a syntax error on ">>". --- diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i index daa66305..5a020d7e 100644 --- a/bindings/java/org/sigrok/core/classes/classes.i +++ b/bindings/java/org/sigrok/core/classes/classes.i @@ -198,11 +198,11 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant) MAP_COMMON(const sigrok::ConfigKey *, std::set, ConfigKey, java.util.Set) -%typemap(jni) std::map> "jobject" -%typemap(jtype) std::map> +%typemap(jni) std::map > "jobject" +%typemap(jtype) std::map > "java.util.Map>" -%typemap(out) std::map> { +%typemap(out) std::map > { jclass HashMap = jenv->FindClass("java/util/HashMap"); jmethodID HashMap_init = jenv->GetMethodID(HashMap, "", "()V"); jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",