https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Allow Olena to use the SCOOP Alternative implementation (back). * oln/core/equipment.hh [OLENA_USE_SCOOP_ALT]: Include stc/scoop-alt.hh and stc/scoop-alt.inc instead of oln/stc/scoop.hh and oln/stc/scoop.hxx. * oln/stc/scoop.hh (stc::is): Name the template parameter for a better understanding. core/equipment.hh | 8 ++++++++ stc/scoop.hh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) Index: oln/core/equipment.hh --- oln/core/equipment.hh (revision 881) +++ oln/core/equipment.hh (working copy) @@ -29,7 +29,11 @@ # define OLN_CORE_EQUIPMENT_HH # include <mlc/contract.hh> +# ifndef OLENA_USE_SCOOP_ALT # include <oln/stc/scoop.hh> // FIXME: Remove "oln/" later. +# else +# include <stc/scoop-alt.hh> +# endif # include <oln/core/init.hh> # define oln_typename_shortcut__(Type, Alias) typename Type::Alias @@ -39,7 +43,11 @@ namespace oln { +# ifndef OLENA_USE_SCOOP_ALT # include <oln/stc/scoop.hxx> // FIXME: Remove "oln/" later. +# else +# include <stc/scoop-alt.inc> +# endif // b stc_decl_associated_type( bkd_niter ); Index: oln/stc/scoop.hh --- oln/stc/scoop.hh (revision 881) +++ oln/stc/scoop.hh (working copy) @@ -53,7 +53,7 @@ template <typename T> struct final; - template < template <class> class > + template < template <class> class category > struct is; typedef mlc::true_ true_;