* mln/core/concept/proxy.hxx (get_proxy_impl<Subject, E>): Swap two definitions to help clang++ properly resolve calls to the overloaded conversion operator. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/concept/proxy.hxx | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ff573d2..41d7081 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2012-03-09 Roland Levillain <roland@lrde.epita.fr> + + More clang++ support in Milena. + + * mln/core/concept/proxy.hxx (get_proxy_impl<Subject, E>): Swap + two definitions to help clang++ properly resolve calls to the + overloaded conversion operator. + 2010-11-29 Roland Levillain <roland@lrde.epita.fr> Start to work around clang++ deficiencies to compile Milena. diff --git a/milena/mln/core/concept/proxy.hxx b/milena/mln/core/concept/proxy.hxx index 2f77cec..114c4a9 100644 --- a/milena/mln/core/concept/proxy.hxx +++ b/milena/mln/core/concept/proxy.hxx @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -263,8 +264,8 @@ namespace mln mlc_is_a(Subject, Proxy)::value > { public: - operator mlc_fix_return(Subject) (); operator mlc_fix_return(mlc_const_return(Subject)) () const; + operator mlc_fix_return(Subject) (); }; template <typename Subject, typename E> -- 1.7.2.5