merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 11 Feb 2010 16:42:20 +0100
changeset 492 63430a82aaf8
parent 491 ca9fb10f9cf3 (current diff)
parent 490 b3493ee58f82 (diff)
child 493 60caf3e67384
child 495 4f10ff2c720c
merge
--- a/.hgtags	Thu Feb 11 16:42:02 2010 +0100
+++ b/.hgtags	Thu Feb 11 16:42:20 2010 +0100
@@ -41,3 +41,5 @@
 bf6e2008180dab292fe49c70a47883852fb8d46b rql-debian-version-0.22.2-1
 42004883d4cd6b42f7898a93df8537d5b87a662d rql-version-0.23.0
 7dd29e42751ebebae4b50126dfb2071d9b2e8de1 rql-debian-version-0.23.0-1
+5cb31b7a463ea8fcc56da4e768648a2f818ec0ee rql-version-0.24.0
+4f8562728585d53053e914171180e623e73ac235 rql-debian-version-0.24.0-1
--- a/__pkginfo__.py	Thu Feb 11 16:42:02 2010 +0100
+++ b/__pkginfo__.py	Thu Feb 11 16:42:20 2010 +0100
@@ -52,16 +52,14 @@
 if sys.platform != 'win32':
     ext_modules = [Extension('rql_solve',
                              ['gecode_solver.cpp'],
-                              libraries=['gecodeint', 'gecodekernel', 
-                                         'gecodesearch','gecodesupport'],
+                              libraries=['gecodeint', 'gecodekernel', 'gecodesearch',],
                              extra_compile_args=['-DGE_VERSION=%s' % GECODE_VERSION],
                          )
                    ]
 else:
     ext_modules = [ Extension('rql_solve',
                               ['gecode_solver.cpp'],
-                              libraries=['gecodeint', 'gecodekernel', 
-                                         'gecodesearch','gecodesupport'],
+                              libraries=['gecodeint', 'gecodekernel', 'gecodesearch',],
                               extra_compile_args=['-DGE_VERSION=%s' % GECODE_VERSION],
                               extra_link_args=['-static-libgcc'],
                               )
--- a/gecode_solver.cpp	Thu Feb 11 16:42:02 2010 +0100
+++ b/gecode_solver.cpp	Thu Feb 11 16:42:20 2010 +0100
@@ -365,7 +365,11 @@
 	unsigned int n_b = 0;
 	if (s->status() != SS_FAILED) {
 	    n_p = s->propagators();
+#if GE_VERSION<PM_VERSION(3,2,0)
 	    n_b = s->branchings();
+#else
+	    n_b = s->branchers();
+#endif
 	}
 #if GE_VERSION<PM_VERSION(2,0,0)
     Engine<RqlSolver> e(s);