[Olena-patches] 3568: Fix compilation issues with Cygwin.

* mln/convert/from_to.hxx, * mln/core/concept/site_set.hh: do NOT prefix template parameter names with '_'. Names prefixed by '_' are reserved! --- milena/ChangeLog | 8 ++++++++ milena/mln/convert/from_to.hxx | 8 ++++---- milena/mln/core/concept/site_set.hh | 16 ++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1b6f60d..31180d8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2009-03-24 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Fix compilation issues with Cygwin. + + * mln/convert/from_to.hxx, + * mln/core/concept/site_set.hh: do NOT prefix template parameter names + with '_'. Names prefixed by '_' are reserved! + 2009-03-24 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Relax a couple of contraints related to labels and integers. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index 6c7bfc7..eb05b13 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -404,14 +404,14 @@ namespace mln from_to_(const Site_Set<S>& from, Image<I>& to); // Site_Set -> std::set - template <typename S, typename P, typename _C> + template <typename S, typename P, typename C_> void - from_to_(const Site_Set<S>& from, std::set<P,_C>& to); + from_to_(const Site_Set<S>& from, std::set<P,C_>& to); // std::set -> Site_Set - template <typename P, typename _C, typename S> + template <typename P, typename C_, typename S> void - from_to_(const std::set<P,_C>& from, Site_Set<S>& to); + from_to_(const std::set<P,C_>& from, Site_Set<S>& to); // histo::array -> image1d template <typename V, typename T> diff --git a/milena/mln/core/concept/site_set.hh b/milena/mln/core/concept/site_set.hh index 863bc3f..844d5aa 100644 --- a/milena/mln/core/concept/site_set.hh +++ b/milena/mln/core/concept/site_set.hh @@ -96,13 +96,13 @@ namespace mln namespace over_load { - template <typename S, typename P, typename _C> + template <typename S, typename P, typename C_> void - from_to_(const Site_Set<S>& from, std::set<P,_C>& to); + from_to_(const Site_Set<S>& from, std::set<P,C_>& to); - template <typename P, typename _C, typename S> + template <typename P, typename C_, typename S> void - from_to_(const std::set<P,_C>& from, Site_Set<S>& to); + from_to_(const std::set<P,C_>& from, Site_Set<S>& to); } // end of namespace mln::convert::over_load @@ -138,10 +138,10 @@ namespace mln namespace over_load { - template <typename S, typename P, typename _C> + template <typename S, typename P, typename C_> inline void - from_to_(const Site_Set<S>& from_, std::set<P,_C>& to) + from_to_(const Site_Set<S>& from_, std::set<P,C_>& to) { mlc_converts_to(mln_psite(S), P)::check(); const S& from = exact(from_); @@ -152,10 +152,10 @@ namespace mln } - template <typename P, typename _C, typename S> + template <typename P, typename C_, typename S> inline void - from_to_(const std::set<P,_C>& from, Site_Set<S>& to_) + from_to_(const std::set<P,C_>& from, Site_Set<S>& to_) { mlc_converts_to(P, mln_i_element(S))::check(); S& to = exact(to_); -- 1.5.6.5