[Olena-patches] oln 10.152: Fix macros for ICC

Index: 10.151/integre/ChangeLog 0a1,8 Index: 10.151/metalic/ChangeLog 0a1,10 Index: 10.151/olena/ChangeLog 0a1,11 Index: 10.151/olena/oln/arith/internal/opdecls.hh 72c72 < : public f_##OPNAME< T1, T2, ntg_return_type(OPNAME, T1, T2) > \ --- 139c139 < struct f_##OPNAME##_cst: std::unary_function<const TYPE, TYPE> \ --- \ 281c281 < return apply2<f_##OPNAME>(input1, input2); \ --- 345c345 < return apply<f_##OPNAME>(input1); \ --- 389c389 < return apply2<f_##OPNAME>(input1, input2); \ --- Index: 10.151/metalic/mlc/type.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 242,245c242,245 < # define mlc_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact>::ret < # define mlc_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact>, Exact>::ret < # define mlc_exact_vt_type_(T, Exact) mlc::exact_vt<T, Exact>::ret < # define mlc_2_exact_vt_type_(self, T, Exact) mlc::exact_vt<self<T, Exact>, Exact>::ret --- mlc::exact_vt<self<T, Exact >, ExactExact >, ExactIndex: 10.151/metalic/mlc/array/1d.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 270c270 < static internal::array1d_start_<T> T##s_1d = internal::array1d_start_<T>() --- internal::array1d_start_<T >() Index: 10.151/metalic/mlc/array/2d.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 299c299 < static internal::array2d_start_<T> T##s_2d = internal::array2d_start_<T>() --- internal::array2d_start_<T >() Index: 10.151/metalic/mlc/array/3d.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 304c304 < static internal::array3d_start_<T> T##s_3d = internal::array3d_start_<T>() --- internal::array3d_start_<T >() Index: 10.151/metalic/mlc/optional.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 36c36 < namespace mlc --- 57,59c57,59 < // argument is given. < // example: < // --- 62c62 < // {} --- 68c68 < # define Optional(T, v) ((Option<T> v) = none()) --- 73c73 < --- 80c80 < --- 82c82 < static inline void do_it(T) --- 86c86 < static inline void do_it(T, U) --- 90c90 < static inline void do_it(T, U, V) --- Index: 10.151/metalic/mlc/is_a.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 35,36c35,37 < # define is_a__check_result_ \ < sizeof(helper<T,U>::check( (T*) helper<T,U>::makeT() )) == sizeof(mlc::internal::yes_) --- 39c40 < namespace mlc --- 42c43 < namespace internal --- 48,49c49,50 < // FIXME: This type is a workaround for g++-2.95 problem with implicit < // typename in <foo<T>::ret::dim>, --- implicit 52c53 < --- 73c74 < --- 95c96 < --- 107,108c108,109 < < --- 121c122 < --- 128c129 < --- 179c180 < # define is_a__2nd_is_meta(T,U) mlc::internal::is_a_< id_of_typeform(U) >::check<T, U> --- id_of_typeform(U) >::check<T, U183c184 < # define id_of_typeform(T) sizeof(mlc::form::get<T>()) --- 189,190c190,191 < # define mlc_is_a(T, U) mlc::internal::wrap<typename mlc::internal::is_a_< id_of_typeform(U) >::check<T, U>< # define mlc_is_a_(T, U) mlc::internal::wrap<mlc::internal::is_a_< id_of_typeform(U) >::check<T, U>--- mlc::internal::is_a_< id_of_typeform(U) >::check<T, U >id_of_typeform(U) >::check<T, U >Index: 10.151/olena/oln/morpho/watershed.hxx 43c43 < const DestValue mask = ntg::cast::force<DestValue>(ntg_max_val(DestValue) - 2); \ --- 45,47c45,47 < const DestValue init = ntg::cast::force<DestValue>(ntg_max_val(DestValue) - 1); \ < const DestValue inqueue = ntg::cast::force<DestValue>(ntg_max_val(DestValue) - 3); \ < const DestValue maxlevel = ntg::cast::force<DestValue>(inqueue - 1) /* no ; */ --- 1) /* no ; */ Index: 10.151/olena/oln/topo/dmap.hxx 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 53c53 < coord --- 135c135 < mk_chamfer_##D##x##D< I, J>(E); \ --- 139,140c139,140 < # define oln_topo_chamfer3_(Name, I, J, K, D, E) \ < inline const chamfer<int>& Name##_##I##_##J##_##K() \ --- 143c143 < mk_chamfer_##D##x##D< I, J, K>(E); \ --- 213c213 < void --- Index: 10.151/olena/oln/transforms/dwt.hh 52c52 < struct Name : public oln::internal::wavelet_coeffs_<Type, Size, Name> \ --- Name > \ Index: 10.151/integre/ntg/real/optraits_builtin_int.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 50c50 < struct optraits<Name> : public optraits<uint_value<Name> > \ --- 58c58 < struct optraits<Name> : public optraits<sint_value<Name> > \ --- 74c74 < --- 79c79 < --- 83c83 < // char is not the same as signed char. --- Index: 10.151/integre/ntg/real/typetraits_builtin_int.hh 1c1 < // Copyright (C) 2002, 2003 EPITA Research and Development Laboratory --- Laboratory 41c41 < struct typetraits<Name> : public typetraits<Value<Name> > \ --- 44,45c44,45 < typedef builtin::to_ntg<Name>::ret ntg_type; \ < typedef builtin::abstract_trait<Name>::ret abstract_type; \ --- 49c49 < typedef typename builtin::value_type<Name, E>::ret ret; \ --- 58,65c58,65 < typedef builtin::signed_trait<Name>::ret signed_type; \ < typedef builtin::unsigned_trait<Name>::ret unsigned_type; \ < typedef builtin::cumul_trait<Name>::ret cumul_type; \ < typedef builtin::largest_trait<Name>::ret largest_type; \ < typedef builtin::signed_largest_trait<Name>::ret signed_largest_type; \ < typedef builtin::signed_cumul_trait<Name>::ret signed_cumul_type; \ < typedef builtin::unsigned_largest_trait<Name>::ret unsigned_largest_type; \ < typedef builtin::unsigned_cumul_trait<Name>::ret unsigned_cumul_type; \ --- signed_largest_type; \ signed_cumul_type; \ unsigned_largest_type; \ unsigned_cumul_type; \ 115c115 < --- 126c126 < --- 158c158 < --- 161c161 < --- Index: 10.151/integre/ntg/core/internal/macros.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- Development Laboratory 46c46 < typename ntg::internal::typetraits<T>::storage_type --- 49c49 < typename ntg::internal::typetraits<T>::abstract_type --- 52c52 < typename ntg::internal::typetraits<T>::optraits_type --- 55c55 < typename ntg::internal::typetraits<T>::behavior_type --- 58c58 < typename ntg::internal::typetraits<T>::base_type --- 61c61 < typename ntg::internal::typetraits<T>::signed_type --- 64c64 < typename ntg::internal::typetraits<T>::unsigned_type --- 67c67 < typename ntg::internal::typetraits<T>::cumul_type --- 70c70 < typename ntg::internal::typetraits<T>::largest_type --- 73c73 < typename ntg::internal::typetraits<T>::signed_largest_type --- 76c76 < typename ntg::internal::typetraits<T>::signed_cumul_type --- 79c79 < typename ntg::internal::typetraits<T>::unsigned_largest_type --- 82c82 < typename ntg::internal::typetraits<T>::unsigned_cumul_type --- 85c85 < typename ntg::internal::typetraits<T>::integer_type --- Index: 10.151/integre/ntg/core/macros.hh 35,36c35,36 < # define ntg_type(T) typename ntg::type_traits<T>::ntg_type < # define ntg_type_(T) typename ntg::type_traits<T>::ntg_type --- 45,46c45,46 < # define ntg_is_a(T, U) mlc_is_a(typename ntg::type_traits<T>::abstract_type, U) < # define ntg_is_a_(T, U) mlc_is_a_(ntg::type_traits<T>::abstract_type, U) --- 52,53c52,53 < # define ntg_abstract_type(T) typename ntg::type_traits<T>::abstract_type < # define ntg_abstract_type_(T) ntg::type_traits<T>::abstract_type --- 55,56c55,56 < # define ntg_storage_type(T) typename ntg::type_traits<T>::storage_type < # define ntg_storage_type_(T) ntg::type_traits<T>::storage_type --- 58,59c58,59 < # define ntg_base_type(T) typename ntg::type_traits<T>::base_type < # define ntg_base_type_(T) ntg::type_traits<T>::base_type --- 61,62c61,62 < # define ntg_signed_type(T) typename ntg::type_traits<T>::signed_type < # define ntg_signed_type_(T) ntg::type_traits<T>::signed_type --- 64,65c64,65 < # define ntg_unsigned_type(T) typename ntg::type_traits<T>::unsigned_type < # define ntg_unsigned_type_(T) ntg::type_traits<T>::unsigned_type --- 67,68c67,68 < # define ntg_integer_type(T) typename ntg::type_traits<T>::integer_type < # define ntg_integer_type_(T) ntg::type_traits<T>::integer_type --- 70,71c70,71 < # define ntg_cumul_type(T) typename ntg::type_traits<T>::cumul_type < # define ntg_cumul_type_(T) ntg::type_traits<T>::cumul_type --- 74,75c74,75 < typename ntg::type_traits<T>::signed_cumul_type < # define ntg_signed_cumul_type_(T) ntg::type_traits<T>::signed_cumul_type --- 78,79c78,79 < typename ntg::type_traits<T>::unsigned_cumul_type < # define ntg_unsigned_cumul_type_(T) ntg::type_traits<T>::unsigned_cumul_type --- 81,82c81,82 < # define ntg_largest_type(T) typename ntg::type_traits<T>::largest_type < # define ntg_largest_type_(T) ntg::type_traits<T>::largest_type --- 85,86c85,86 < typename ntg::type_traits<T>::signed_largest_type < # define ntg_signed_largest_type_(T) ntg::type_traits<T>::signed_largest_type --- 89c89 < typename ntg::type_traits<T>::unsigned_largest_type --- 91c91 < ntg::type_traits<T>::unsigned_largest_type --- 94c94 < typename ntg::type_traits<T>::comp_type --- 96c96 < ntg::type_traits<T>::comp_type --- 98,99c98,99 < # define ntg_unsafe_type(T) typename ntg::type_traits<T>::unsafe_type < # define ntg_unsafe_type_(T) ntg::type_traits<T>::unsafe_type --- 105c105 < # define ntg_zero_val(T) ntg::type_traits<T>::zero() --- 107c107 < # define ntg_unit_val(T) ntg::type_traits<T>::unit() --- 109c109 < # define ntg_max_val(T) ntg::type_traits<T>::max() --- 111c111 < # define ntg_min_val(T) ntg::type_traits<T>::min() --- 113c113 < # define ntg_inf_val(T) ntg::type_traits<T>::inf() --- 115c115 < # define ntg_sup_val(T) ntg::type_traits<T>::sup() --- 117c117 < # define ntg_max_print_width(T) ntg::type_traits<T>::max_print_width() --- 119c119 < # define ntg_nb_comp(T) ntg::type_traits<T>::nb_comp --- 126c126 < typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::ret --- ntg::internal::deduce_from_traits<ntg::internal::operator_##Op , T1, T2 128c128 < ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::ret --- T2131c131 < typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2> --- ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2133c133 < ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2> --- T2136c136 < typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::impl --- ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2 138c138 < ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::impl --- T2144c144 < # define ntg_name(T) ntg::type_traits<T>::name() --- 155c155 < # define ntg_get_value_type(T, E) ntg::type_traits<T>::build_value_type<E> --- > # define ntg_get_value_type(T, E) ntg::type_traits< T >::build_value_type<E161c161 < #define ntg_nbits(T) ntg::internal::typetraits<T>::size --- 195c195 < ntg_if_vectorial_nb_comp(B)>--- > ntg_if_vectorial_nb_comp(B) >206c206 < ntg_if_vectorial_nb_comp_(B)>--- > ntg_if_vectorial_nb_comp_(B) >Index: 10.151/olena/oln/core/abstract/image.hh 344c344 < typename oln::mute<ImgType>::ret --- > typename oln::mute<ImgTypeIndex: 10.151/olena/oln/morpho/attributes.hh 36,42c36,42 < # define attr_lambda_type(T) typename oln::morpho::attr::attr_traits<T>::lambda_type < # define attr_env_type(T) typename oln::morpho::attr::attr_traits<T>::env_type < # define attr_value_type(T) typename oln::morpho::attr::attr_traits<T>::value_type < < # define attr_lambda_type_(T) oln::morpho::attr::attr_traits<T>::lambda_type < # define attr_env_type_(T) oln::morpho::attr::attr_traits<T>::env_type < # define attr_value_type_(T) oln::morpho::attr::attr_traits<T>::value_type --- T >::lambda_type T >::value_type > # define attr_lambda_type_(T) oln::morpho::attr::attr_traits< T >::lambda_type > # define attr_env_type_(T) oln::morpho::attr::attr_traits< T >::env_type > # define attr_value_type_(T) oln::morpho::attr::attr_traits< T >::value_type Index: 10.151/olena/oln/topo/tarjan/tarjan.hh 33,35c33,35 < # define oln_tarjan_input_type(T) typename oln::topo::tarjan::tarjan_traits<T>::input_type < # define oln_tarjan_output_type(T) typename oln::topo::tarjan::tarjan_traits<T>::output_type < # define oln_tarjan_attr_type(T) typename oln::topo::tarjan::tarjan_traits<T>::attr_type --- oln::topo::tarjan::tarjan_traits<T >::input_type oln::topo::tarjan::tarjan_traits<T >::output_type oln::topo::tarjan::tarjan_traits<T >::attr_type