From: Soeren Apel <redacted>
Date: Sun, 28 Mar 2021 21:17:17 +0000 (+0200)
Subject: Amend #119 to use vector instead of tuple
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=004fd9ffd3d3aa802a7ac94367e627b06b1b8aea;p=libsigrok.git

Amend #119 to use vector instead of tuple

This way, we don't need to bump glibmm to 2.54, which we otherwise would
---

diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i
index 94913d0f..eb557d03 100644
--- a/bindings/python/sigrok/core/classes.i
+++ b/bindings/python/sigrok/core/classes.i
@@ -344,8 +344,8 @@ Glib::VariantBase python_to_variant_by_key(PyObject *input, const sigrok::Config
         PyObject *numObj = PyTuple_GetItem(input, 0);
         PyObject *denomObj = PyTuple_GetItem(input, 1);
         if ((PyInt_Check(numObj) || PyLong_Check(numObj)) && (PyInt_Check(denomObj) || PyLong_Check(denomObj))) {
-          std::tuple<guint64, guint64> tpl = {PyInt_AsLong(numObj), PyInt_AsLong(denomObj)};
-          return Glib::Variant< std::tuple<guint64,guint64> >::Variant::create(tpl);
+          const std::vector<guint64> v = {(guint64)PyInt_AsLong(numObj), (guint64)PyInt_AsLong(denomObj)};
+          return Glib::Variant< std::vector<guint64> >::create(v);
         }
     }
     throw sigrok::Error(SR_ERR_ARG);