[Olena-patches] 727: Catch up with Static.

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Catch up with Static. * oln/core/typedefs.hh: Catch up with stc/scoop-alt.hh. * oln/core/abstract/image/bbox/hierarchy.hh, * oln/core/abstract/image/dimension/hierarchy.hh, * oln/core/abstract/image/hybrid/classical.hh, * oln/core/abstract/image/mutability/hierarchy.hh, * oln/core/abstract/image/neighborhood/hierarchy.hh, * oln/core/abstract/image/value_wise_accessibility/hierarchy.hh, * oln/core/abstract/iterator_on_points.hh, * oln/core/abstract/point.hh, * oln/core/internal/dpoint_nd.hh, * oln/core/image_entry.hh: s/OLENA_USE_NEW_SCOOP2/OLENA_USE_SCOOP_ALT/g. abstract/image/bbox/hierarchy.hh | 4 ++-- abstract/image/dimension/hierarchy.hh | 12 ++++++------ abstract/image/hybrid/classical.hh | 16 ++++++++-------- abstract/image/mutability/hierarchy.hh | 4 ++-- abstract/image/neighborhood/hierarchy.hh | 4 ++-- abstract/image/value_wise_accessibility/hierarchy.hh | 8 ++++---- abstract/iterator_on_points.hh | 8 ++++---- abstract/point.hh | 12 ++++++------ image_entry.hh | 8 ++++---- internal/dpoint_nd.hh | 8 ++++---- typedefs.hh | 8 +++----- 11 files changed, 45 insertions(+), 47 deletions(-) Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 726) +++ oln/core/typedefs.hh (working copy) @@ -41,11 +41,11 @@ # include <stc/any.hh> # include <stc/exact.hh> -# ifdef OLENA_USE_NEW_SCOOP2 -# include <stc/scoop2.hh> +# ifdef OLENA_USE_SCOOP_ALT +# include <stc/scoop-alt.hh> # else # include <stc/scoop.hh> -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT # include <oln/core/type.hh> // FIXME: Move to oln/core. @@ -56,11 +56,9 @@ | Namespace equipment. | `----------------------*/ -# ifndef OLENA_USE_NEW_SCOOP2 // The virtual types facility is inserted here because it also // triggers Metalic's typedef introspection equipment. stc_scoop_equipment_for_namespace(oln); -# endif // !OLENA_USE_NEW_SCOOP2 namespace oln Index: oln/core/image_entry.hh --- oln/core/image_entry.hh (revision 726) +++ oln/core/image_entry.hh (working copy) @@ -71,9 +71,9 @@ // FIXME: default definitions: typedef oln_point(E) psite_type; -# ifndef OLENA_USE_NEW_SCOOP2 +# ifndef OLENA_USE_SCOOP_ALT typedef oln_value(E) rvalue_type; -# endif // !OLENA_USE_NEW_SCOOP2 +# endif // !OLENA_USE_SCOOP_ALT /// \brief Morpher type. /// @@ -81,13 +81,13 @@ typedef mlc::none morpher_type; }; -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT template <typename E> struct single_vtype< image_entry<E>, typedef_::rvalue_type > { typedef oln_value(E) ret; }; -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT /// Entry class for point sets: image_entry<E> is an alias for Index: oln/core/abstract/iterator_on_points.hh --- oln/core/abstract/iterator_on_points.hh (revision 726) +++ oln/core/abstract/iterator_on_points.hh (working copy) @@ -54,19 +54,19 @@ struct vtypes< abstract::iterator_on_points<E> > { typedef stc::abstract point_type; -# ifndef OLENA_USE_NEW_SCOOP2 +# ifndef OLENA_USE_SCOOP_ALT typedef oln_deduce_deferred_vtype(E, point, coord) coord_type; -# endif // !OLENA_USE_NEW_SCOOP2 +# endif // !OLENA_USE_SCOOP_ALT }; -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT template <typename E> struct single_vtype< abstract::iterator_on_points<E>, typedef_::coord_type > { typedef oln_deduce_deferred_vtype(E, point, coord) ret; }; -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT namespace abstract Index: oln/core/abstract/image/hybrid/classical.hh --- oln/core/abstract/image/hybrid/classical.hh (revision 726) +++ oln/core/abstract/image/hybrid/classical.hh (working copy) @@ -178,11 +178,11 @@ mlc::eq_< oln_vtype(E, grid), oln::grid1d >, mlc::eq_< oln_deduce_vtype(E, topo, is_random_accessible), mlc::true_ >, // FIXME: Shouldn't we use stc::is_found (resp. mlc::is_found) here? -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT mlc::neq_< oln_deduce_vtype(E, topo, bbox), stc::not_found > # else mlc::neq_< oln_deduce_vtype(E, topo, bbox), mlc::not_found > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::classical_1d_image<E> ret; @@ -196,11 +196,11 @@ mlc::eq_< oln_vtype(E, grid), oln::grid2d >, mlc::eq_< oln_deduce_vtype(E, topo, is_random_accessible), mlc::true_ >, // FIXME: Shouldn't we use stc::is_found (resp. mlc::is_found) here? -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT mlc::neq_< oln_deduce_vtype(E, topo, bbox), stc::not_found > # else mlc::neq_< oln_deduce_vtype(E, topo, bbox), mlc::not_found > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::classical_2d_image<E> ret; @@ -214,11 +214,11 @@ mlc::eq_< oln_vtype(E, grid), oln::grid3d >, mlc::eq_< oln_deduce_vtype(E, topo, is_random_accessible), mlc::true_ >, // FIXME: Shouldn't we use stc::is_found (resp. mlc::is_found) here? -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT mlc::neq_< oln_deduce_vtype(E, topo, bbox), stc::not_found > # else mlc::neq_< oln_deduce_vtype(E, topo, bbox), mlc::not_found > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::classical_3d_image<E> ret; @@ -231,11 +231,11 @@ where_< mlc::and_< mlc::eq_< oln_deduce_vtype(E, topo, is_random_accessible), mlc::true_ >, // FIXME: Shouldn't we use stc::is_found (resp. mlc::is_found) here? -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT mlc::neq_< oln_deduce_vtype(E, topo, bbox), stc::not_found > # else mlc::neq_< oln_deduce_vtype(E, topo, bbox), mlc::not_found > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::classical_image<E> ret; Index: oln/core/abstract/image/mutability/hierarchy.hh --- oln/core/abstract/image/mutability/hierarchy.hh (revision 726) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -108,11 +108,11 @@ /// With mutability. template <typename E> struct case_< image_hierarchy_wrt_mutability, E, 1 > : -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT where_< stc::is_found_< oln_find_vtype(E, lvalue) > > # else where_< mlc::is_found_< oln_find_vtype(E, lvalue) > > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT { typedef abstract::mutable_image<E> ret; }; Index: oln/core/abstract/image/dimension/hierarchy.hh --- oln/core/abstract/image/dimension/hierarchy.hh (revision 726) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -98,11 +98,11 @@ struct case_< image_hierarchy_wrt_dimension, E, 1 > : where_< mlc::and_< mlc::eq_< oln_grid(E), oln::grid1d >, -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT stc::is_found_< oln_find_vtype(E, lvalue) > # else mlc::is_found_< oln_find_vtype(E, lvalue) > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::mutable_image1d<E> ret; @@ -121,11 +121,11 @@ struct case_< image_hierarchy_wrt_dimension, E, 3 > : where_< mlc::and_< mlc::eq_< oln_grid(E), oln::grid2d >, -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT stc::is_found_< oln_find_vtype(E, lvalue) > # else mlc::is_found_< oln_find_vtype(E, lvalue) > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::mutable_image2d<E> ret; @@ -144,11 +144,11 @@ struct case_< image_hierarchy_wrt_dimension, E, 5 > : where_< mlc::and_< mlc::eq_< oln_grid(E), oln::grid3d >, -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT stc::is_found_< oln_find_vtype(E, lvalue) > # else mlc::is_found_< oln_find_vtype(E, lvalue) > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT > > { typedef abstract::mutable_image3d<E> ret; Index: oln/core/abstract/image/neighborhood/hierarchy.hh --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 726) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -107,11 +107,11 @@ template <typename E> struct case_< image_hierarchy_wrt_neighborhood, E, 1 > : // FIXME: Shouldn't we use stc::is_found (resp. mlc::is_found) here? -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT where_< mlc::neq_< oln_find_vtype(E, neighborhood), stc::not_found > > # else where_< mlc::neq_< oln_find_vtype(E, neighborhood), mlc::not_found > > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT { typedef abstract::image_having_neighborhood<E> ret; }; Index: oln/core/abstract/image/bbox/hierarchy.hh --- oln/core/abstract/image/bbox/hierarchy.hh (revision 726) +++ oln/core/abstract/image/bbox/hierarchy.hh (working copy) @@ -136,11 +136,11 @@ template <typename E> struct case_< image_hierarchy_wrt_bbox, E, 1 > : // FIXME: Shouldn't we use stc::is_found (resp. mlc::is_found) here? -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT where_< mlc::neq_< oln_deduce_vtype(E, topo, bbox), stc::not_found > > # else where_< mlc::neq_< oln_deduce_vtype(E, topo, bbox), mlc::not_found > > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT { typedef abstract::image_having_bbox<E> ret; }; Index: oln/core/abstract/image/value_wise_accessibility/hierarchy.hh --- oln/core/abstract/image/value_wise_accessibility/hierarchy.hh (revision 726) +++ oln/core/abstract/image/value_wise_accessibility/hierarchy.hh (working copy) @@ -133,7 +133,7 @@ /// With mutable value-wise random accessibility. template <typename E> struct case_< image_hierarchy_wrt_value_wise_accessibility, E, 1 > : -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT where_< mlc_and( stc::is_found_< oln_find_vtype(E, fwd_viter) >, stc::is_found_< oln_find_vtype(E, mutable_value_proxy) > ) @@ -143,7 +143,7 @@ mlc_and( mlc::is_found_< oln_find_vtype(E, fwd_viter) >, mlc::is_found_< oln_find_vtype(E, mutable_value_proxy) > ) > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT { typedef abstract::mutable_image_being_value_wise_random_accessible<E> ret; }; @@ -151,11 +151,11 @@ /// With (constant) value-wise random accessibility. template <typename E> struct case_< image_hierarchy_wrt_value_wise_accessibility, E, 2 > : -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT where_< stc::is_found_< oln_find_vtype(E, fwd_viter) > > # else where_< mlc::is_found_< oln_find_vtype(E, fwd_viter) > > -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT { typedef abstract::image_being_value_wise_random_accessible<E> ret; }; Index: oln/core/abstract/point.hh --- oln/core/abstract/point.hh (revision 726) +++ oln/core/abstract/point.hh (working copy) @@ -69,18 +69,18 @@ // FIXME: Prefer to use final<deduce..> when possible. typedef stc::abstract grid_type; typedef stc::abstract dpoint_type; -# ifndef OLENA_USE_NEW_SCOOP2 +# ifndef OLENA_USE_SCOOP_ALT typedef oln_deduce_deferred_vtype(E, dpoint, coord) coord_type; -# endif // !OLENA_USE_NEW_SCOOP2 +# endif // !OLENA_USE_SCOOP_ALT typedef stc::abstract dim_type; -# ifndef OLENA_USE_NEW_SCOOP2 +# ifndef OLENA_USE_SCOOP_ALT typedef oln_dim(E) dim_t; typedef xtd::vec<mlc_value(dim_t), coord_type> vec_type; -# endif // !OLENA_USE_NEW_SCOOP2 +# endif // !OLENA_USE_SCOOP_ALT }; -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT template <typename E> struct single_vtype< abstract::point<E>, typedef_::coord_type> { @@ -96,7 +96,7 @@ public: typedef xtd::vec<mlc_value(dim_t), coord_t> ret; }; -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT namespace abstract Index: oln/core/internal/dpoint_nd.hh --- oln/core/internal/dpoint_nd.hh (revision 726) +++ oln/core/internal/dpoint_nd.hh (working copy) @@ -54,16 +54,16 @@ template <typename E> struct vtypes< internal::dpoint_nd<E> > { -# ifndef OLENA_USE_NEW_SCOOP2 +# ifndef OLENA_USE_SCOOP_ALT private: typedef oln_deferred_vtype(E, dim) dim_t; typedef oln_deferred_vtype(E, coord) coord_t; public: typedef xtd::vec<mlc_value(dim_t), coord_t> vec_type; -# endif // !OLENA_USE_NEW_SCOOP2 +# endif // !OLENA_USE_SCOOP_ALT }; -# ifdef OLENA_USE_NEW_SCOOP2 +# ifdef OLENA_USE_SCOOP_ALT template <typename E> struct single_vtype< internal::dpoint_nd<E>, typedef_::vec_type > { @@ -73,7 +73,7 @@ public: typedef xtd::vec<mlc_value(dim_t), coord_t> ret; }; -# endif // OLENA_USE_NEW_SCOOP2 +# endif // OLENA_USE_SCOOP_ALT namespace internal {