X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fswig%2Ftemplates.i;h=1baaf0fe3a6ca93861e689baa57b37602e067094;hb=36bb818d6f10ac1187f160f4c2ab1169aeb4e86f;hp=b3cf9fb98b2c1f9dadb5e667442094c3feb0350d;hpb=f2831ab35b4988930535dfd135884873b1b5b00d;p=libsigrok.git

diff --git a/bindings/swig/templates.i b/bindings/swig/templates.i
index b3cf9fb9..1baaf0fe 100644
--- a/bindings/swig/templates.i
+++ b/bindings/swig/templates.i
@@ -60,14 +60,21 @@ namespace std {
    for the map instantiation from compiling. */
 %template(ConfigVector)
     std::vector<const sigrok::ConfigKey *>;
+
 %template(ConfigMap)
     std::map<const sigrok::ConfigKey *, Glib::VariantBase>;
 
-%template(CapabilitySet)
-    std::set<enum sigrok::Capability>;
+%template(ConfigSet)
+    std::set<const sigrok::ConfigKey *>;
+
+/* Workaround for SWIG bug. The vector template instantiation
+   isn't needed but somehow fixes a bug that stops the wrapper
+   for the set instantiation from compiling. */
+%template(CapabilityVector)
+    std::vector<const sigrok::Capability *>;
 
-%template(ConfigKeys)
-    std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >;
+%template(CapabilitySet)
+    std::set<const sigrok::Capability *>;
 
 %template(OptionVector)
     std::vector<std::shared_ptr<sigrok::Option> >;