[Olena-patches] 728: Reduce ambiguity risk with case meta-code location.

2007-02-01 Thierry GERAUD &lt;theo(a)tegucigalpa.lrde.epita.fr&gt; * mlc/case.hh (mlc_case_equipment_for_namespace): Rename NAMESPACE::internal into NAMESPACE::mlc_case_internal. * mlc/cmp.hh (is_not_value, is_not_bexpr): Shorten. Index: mlc/case.hh =================================================================== --- mlc/case.hh (revision 720) +++ mlc/case.hh (working copy) @@ -191,7 +191,7 @@ \ \ \ - namespace internal \ + namespace mlc_case_internal \ { \ \ template <typename use, \ @@ -393,33 +393,33 @@ template <typename context, typename data> \ struct get_case_ \ { \ - typedef typename NAMESPACE::internal::select_case_<mlc::internal::a_get_case, context, data>::ret ret; \ + typedef typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_get_case, context, data>::ret ret; \ }; \ \ \ template <typename context, typename data> \ struct case_ <context, data, mlc::internal::unknown_case_id> \ \ - : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::internal::select_case_<mlc::internal::a_simple_case, \ + : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_simple_case, \ context, data>::ret), \ mlc::none >, \ mlc::ERROR::NO_case_STATEMENT_CAN_BE_SELECTED > \ \ { \ - typedef typename NAMESPACE::internal::select_case_<mlc::internal::a_simple_case, context, data>::ret ret; \ + typedef typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_simple_case, context, data>::ret ret; \ }; \ \ \ template <typename context, typename data> \ struct switch_ \ \ - : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::internal::select_case_<mlc::internal::a_switch_case, \ + : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_switch_case, \ context, data>::ret), \ mlc::none >, \ mlc::ERROR::NO_case_STATEMENT_CAN_BE_SELECTED > \ \ { \ - typedef typename NAMESPACE::internal::select_case_<mlc::internal::a_switch_case, context, data>::ret case_t; \ + typedef typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_switch_case, context, data>::ret case_t; \ typedef typename case_t::ret ret; \ }; \ \ Index: mlc/cmp.hh =================================================================== --- mlc/cmp.hh (revision 720) +++ mlc/cmp.hh (working copy) @@ -83,7 +83,7 @@ /// Check whether \a T is not a mlc::abstract::value. template <typename T> - struct is_not_value : public not_<mlc_is_a(T, mlc::abstract::value)>::bexpr + struct is_not_value : public mlc_is_not_a(T, mlc::abstract::value)::bexpr { }; @@ -96,7 +96,7 @@ /// Check whether \a T is not a mlc::abstract::bexpr. template <typename T> - struct is_not_bexpr : public not_<mlc_is_a(T, mlc::abstract::bexpr)>::bexpr + struct is_not_bexpr : public mlc_is_not_a(T, mlc::abstract::bexpr)::bexpr { };