adapt to recent changes in the Gecode SVN