https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Catch up with the latest name changes in Static. * oln/core/abstract/image_dimension.hh (case_<grid_dim_tag, grid_type, 1>) (case_<grid_dim_tag, grid_type, 2>) (case_<grid_dim_tag, grid_type, 3>): s/stc::is_a/stc::abstraction_as_type/. * oln/core/abstract/macros.hh (oln_type_of, oln_type_of_) * oln/core/abstract/grid.hh (oln_grd_type_of, oln_grd_type_of_): Catch up with the new names of Static macros. * tests/image_entry.cc: Adjust test. oln/core/abstract/grid.hh | 4 ++-- oln/core/abstract/image_dimension.hh | 6 +++--- oln/core/abstract/macros.hh | 9 ++------- tests/image_entry.cc | 3 ++- 4 files changed, 9 insertions(+), 13 deletions(-) Index: tests/image_entry.cc --- tests/image_entry.cc (revision 472) +++ tests/image_entry.cc (working copy) @@ -74,7 +74,8 @@ mlc::assert_< mlc_eq(my::image::grid_type, oln::grid1d) >::check(); // Check its externally defined vtype. mlc::assert_< mlc_eq( my::image::image_dimension_type, - stc::is_a<oln::abstract::image1d> ) >::check(); + stc::abstraction_as_type<oln::abstract::image1d> ) + >::check(); // Check its image dimension abstraction. mlc::assert_< mlc_is_a_(my::image, oln::abstract::image1d) >::check(); // Ensure we can instantiate it. Index: oln/core/abstract/macros.hh --- oln/core/abstract/macros.hh (revision 472) +++ oln/core/abstract/macros.hh (working copy) @@ -28,19 +28,14 @@ #ifndef OLENA_CORE_ABSTRACT_MACROS_HH # define OLENA_CORE_ABSTRACT_MACROS_HH -// FIXME: Perhaps only ``external'' versions are really useful (since -// they are more precise), and we could get rid of other versions. -// Likewise, we could drop the stc_typeof without namespace -// information. - /// \def Shortcuts for virtual types associated to images (version to // be used inside a template). # define oln_type_of(ImageType, Alias) \ -stc_typeof_in_namespace(oln, oln::category::image, ImageType, Alias) +stc_type_of(oln, oln::category::image, ImageType, Alias) /// \def Shortcuts for virtual types associated to images (version to // be used outside a template). # define oln_type_of_(ImageType, Alias) \ -stc_typeof_in_namespace_(oln, oln::category::image, ImageType, Alias) +stc_type_of_(oln, oln::category::image, ImageType, Alias) #endif // ! OLENA_CORE_ABSTRACT_MACROS_HH Index: oln/core/abstract/grid.hh --- oln/core/abstract/grid.hh (revision 472) +++ oln/core/abstract/grid.hh (working copy) @@ -36,10 +36,10 @@ # define oln_grd_type_of(GridType, Alias) \ -stc_typeof_in_namespace(oln, oln::category::grid, GridType, Alias) +stc_type_of(oln, oln::category::grid, GridType, Alias) # define oln_grd_type_of_(GridType, Alias) \ -stc_typeof_in_namespace_(oln, oln::category::grid, GridType, Alias) +stc_type_of_(oln, oln::category::grid, GridType, Alias) namespace oln { Index: oln/core/abstract/image_dimension.hh --- oln/core/abstract/image_dimension.hh (revision 472) +++ oln/core/abstract/image_dimension.hh (working copy) @@ -107,7 +107,7 @@ public mlc::where_< mlc_eq(grid_type, oln::grid1d) > { // Super class if test succeeds. - typedef stc::is_a<abstract::image1d> ret; + typedef stc::abstraction_as_type<abstract::image1d> ret; }; template <typename grid_type> @@ -116,7 +116,7 @@ public mlc::where_< mlc_eq(grid_type, oln::grid2d) > { // Super class if test succeeds. - typedef stc::is_a<abstract::image2d> ret; + typedef stc::abstraction_as_type<abstract::image2d> ret; }; template <typename grid_type> @@ -125,7 +125,7 @@ public mlc::where_< mlc_eq(grid_type, oln::grid3d) > { // Super class if test succeeds. - typedef stc::is_a<abstract::image3d> ret; + typedef stc::abstraction_as_type<abstract::image3d> ret; }; /// Abort when grid_type is not handled by the previous cases.