https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Catch up with Static's support for multiple inheritance. * oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh: s/stc_super_/stc_get_supers/. * tests/image_entry.cc: Add a missing `public' qualifier for exported types. oln/core/1d/grid1d.hh | 2 +- oln/core/2d/grid2d.hh | 2 +- oln/core/3d/grid3d.hh | 2 +- tests/image_entry.cc | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) Index: tests/image_entry.cc --- tests/image_entry.cc (revision 493) +++ tests/image_entry.cc (working copy) @@ -67,6 +67,7 @@ // A very simple 1-D image. class image : public oln::set_super_type<my::image>::ret { + public: typedef image self_type; // Internal vtypes. typedef oln_type_of_(self_type, grid) grid_type; Index: oln/core/1d/grid1d.hh --- oln/core/1d/grid1d.hh (revision 493) +++ oln/core/1d/grid1d.hh (working copy) @@ -57,7 +57,7 @@ }; /// A 1-dimension rectangular grid. - struct grid1d : public stc_super_(grid1d) + struct grid1d : public stc_get_supers(grid1d) { protected: grid1d() {} Index: oln/core/2d/grid2d.hh --- oln/core/2d/grid2d.hh (revision 493) +++ oln/core/2d/grid2d.hh (working copy) @@ -57,7 +57,7 @@ }; /// A 2-dimension rectangular grid. - struct grid2d : public stc_super_(grid2d) + struct grid2d : public stc_get_supers(grid2d) { protected: grid2d() {} Index: oln/core/3d/grid3d.hh --- oln/core/3d/grid3d.hh (revision 493) +++ oln/core/3d/grid3d.hh (working copy) @@ -57,7 +57,7 @@ }; /// A 3-dimension rectangular grid. - struct grid3d : public stc_super_(grid3d) + struct grid3d : public stc_get_supers(grid3d) { protected: grid3d() {}