4034: Fix a bug in Swilena's wrapper of box2d.

* box2d.i: Include box.ixx earlier than mln/core/alias/box2d.hh to generate working headers. --- swilena/ChangeLog | 7 +++++++ swilena/box2d.i | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 1d9abbc..c52ff12 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-08 Roland Levillain <roland@lrde.epita.fr> + Fix a bug in Swilena's wrapper of box2d. + + * box2d.i: Include box.ixx earlier than mln/core/alias/box2d.hh to + generate working headers. + +2009-06-08 Roland Levillain <roland@lrde.epita.fr> + Disable test python/dynamic-image2d-misc.py with SWIG < 1.3.39. * python/Makefile.am (TESTS) [!HAVE_SWIG_1_3_39]: Remove diff --git a/swilena/box2d.i b/swilena/box2d.i index f491be1..93b2b51 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -21,6 +21,8 @@ %module box2d +%include "box.ixx" + %import box2d_piter.i %{ @@ -29,8 +31,6 @@ %include "mln/core/alias/box2d.hh" -%include "box.ixx" - %extend mln::box< mln::point<mln::grid::square, mln::def::coord> > { // Provide a ctor creating an `mln::box2d' from two `int's. -- 1.6.1.2

Roland Levillain a écrit :
* box2d.i: Include box.ixx earlier than mln/core/alias/box2d.hh to generate working headers.
--- swilena/ChangeLog | 7 +++++++ swilena/box2d.i | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 1d9abbc..c52ff12 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-08 Roland Levillain <roland@lrde.epita.fr>
+ Fix a bug in Swilena's wrapper of box2d. + + * box2d.i: Include box.ixx earlier than mln/core/alias/box2d.hh to + generate working headers. + +2009-06-08 Roland Levillain <roland@lrde.epita.fr> + Disable test python/dynamic-image2d-misc.py with SWIG < 1.3.39.
* python/Makefile.am (TESTS) [!HAVE_SWIG_1_3_39]: Remove diff --git a/swilena/box2d.i b/swilena/box2d.i index f491be1..93b2b51 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -21,6 +21,8 @@
%module box2d
+%include "box.ixx" + %import box2d_piter.i
%{ @@ -29,8 +31,6 @@
%include "mln/core/alias/box2d.hh"
-%include "box.ixx" - %extend mln::box< mln::point<mln::grid::square, mln::def::coord> > { // Provide a ctor creating an `mln::box2d' from two `int's.
FYI, I searched this bug using `git bisect', and it's just fantastic.
participants (1)
-
Roland Levillain