https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Keep type_of_ its original semantics, and be consistent with macro names. * stc/vtypes.hh (type_of_): Rename as... (direct_type_of_): ...this. (exact_type_of_): Rename as... (type_of_): ...this. (stc_type_of_, stc_direct_type_of_): Adjust macros. vtypes.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 559) +++ stc/vtypes.hh (working copy) @@ -773,7 +773,7 @@ \ /** Entry point of the vtype retrieval algorithm. */ \ template <typename category, typename from_type, typename typedef_type> \ - struct type_of_ \ + struct direct_type_of_ \ { \ /* Look for the typedef in internal vtypes. */ \ typedef typename \ @@ -811,13 +811,13 @@ /** Entry point of the vtype retrieval algorithm (working on the */ \ /** exact version of \a from_type). */ \ template <typename category, typename from_type, typename typedef_type> \ - struct exact_type_of_ \ + struct type_of_ \ { \ /* Get the exact type of \a from_type. */ \ typedef stc_to_exact(from_type) from_exact_type; \ /* ``Run'' type_of_. */ \ typedef typename \ - type_of_<category, from_exact_type, typedef_type>::ret ret; \ + direct_type_of_<category, from_exact_type, typedef_type>::ret ret; \ }; \ \ struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n @@ -945,7 +945,7 @@ /// Get the vtype \a Typedef, declared in \a Namespace, from the /// exact type of \a FromType (version to be used outside a template). #define stc_type_of_(Namespace, Category, FromType, Typedef) \ - Namespace::exact_type_of_< Category, FromType, \ + Namespace::type_of_< Category, FromType, \ Namespace::typedef_:: Typedef##_type >::ret @@ -957,7 +957,7 @@ /// Get the vtype \a Typedef, declared in \a Namespace, from \a /// FromType directly (version to be used outside a template). #define stc_direct_type_of_(Namespace, Category, FromType, Typedef) \ - Namespace::type_of_< Category, FromType, \ + Namespace::direct_type_of_< Category, FromType, \ Namespace::typedef_:: Typedef##_type >::ret