From 94ab42612ad96a27bd1ea4890e570adc1f1649ad Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 6 Feb 2024 17:28:48 +0100
Subject: [PATCH] work around some Swig 4.2 change

Several test cases started failing after updating to Swig 4.2 because
the spot.ltsmin module and the spot.impl module were using different
names for atomic_prop_set.  This seems to work around it.

* python/spot/impl.i: Specify the full type for atomic_prop_set.
---
 python/spot/impl.i | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/python/spot/impl.i b/python/spot/impl.i
index 680e90149..778983aac 100644
--- a/python/spot/impl.i
+++ b/python/spot/impl.i
@@ -529,7 +529,13 @@ namespace std {
   %template(vectorstring) vector<string>;
   %template(vectorint) vector<int>;
   %template(pair_formula_vectorstring) pair<spot::formula, vector<string>>;
-  %template(atomic_prop_set) set<spot::formula>;
+   // We specify the optional std::less/std::allocator arguments of set
+   // to work around an issue that appeared with Swig 4.2.  Without those
+   // arguments the type of set<spot::formula> used in module ltlsmin.i
+   // does not match the type of set<spot::formula> used here!
+  %template(atomic_prop_set) set<spot::formula,
+                                 std::less<spot::formula>,
+                                 std::allocator<spot::formula>>;
   %template(vectorofvectorofformulas) vector<vector<spot::formula>>;
   %template(setunsigned) set<unsigned>;
   %template(relabeling_map) map<spot::formula, spot::formula>;
@@ -813,7 +819,9 @@ def state_is_accepting(self, src) -> "bool":
 %include <spot/taalgos/stats.hh>
 %include <spot/taalgos/minimize.hh>
 
-%extend std::set<spot::formula> {
+%extend std::set<spot::formula,
+                 std::less<spot::formula>,
+                 std::allocator<spot::formula>> {
   std::string __str__()
   {
     std::ostringstream os;