[Olena-patches] last-svn-commit-540-gd85cb3e Fix warnings with clang 1.1

28 Apr 2011

* mln/accu/line.hh: Use def::coord.

	* mln/algebra/vec.hh,
	* mln/convert/from_to.hxx,
	* mln/core/image/dmorph/sub_image.hh,
	* mln/core/internal/site_set_iterator_base.hh,
	* mln/core/site_set/box.hh,
	* mln/core/site_set/p_array.hh,
	* mln/core/site_set/p_edges.hh,
	* mln/core/site_set/p_vertices.hh: Make forward declaration
	consistent with declaration.

	* mln/value/builtin/carrays.hh: Explicitly convert to char *.

	* mln/convert/impl/from_double_to_value.hh,
	* mln/convert/impl/from_int_to_value.hh,
	* mln/core/point.hh,
	* mln/opt/element.hh: Avoid unused variable warning.

	* mln/convert/impl/from_image_to_site_set.hh: Remove useless local variable.
---
 milena/ChangeLog                                   |   25 ++++++++++++++++++++
 milena/mln/accu/line.hh                            |   17 +++++++------
 milena/mln/algebra/vec.hh                          |    5 ++-
 milena/mln/convert/from_to.hxx                     |    5 ++-
 milena/mln/convert/impl/from_double_to_value.hh    |    5 +++-
 milena/mln/convert/impl/from_image_to_site_set.hh  |    4 +-
 milena/mln/convert/impl/from_int_to_value.hh       |    2 +
 milena/mln/core/image/dmorph/sub_image.hh          |    5 ++-
 milena/mln/core/internal/site_set_iterator_base.hh |    6 +++-
 milena/mln/core/point.hh                           |    5 ++-
 milena/mln/core/site_set/box.hh                    |    8 +++---
 milena/mln/core/site_set/p_array.hh                |    7 +++--
 milena/mln/core/site_set/p_edges.hh                |    5 ++-
 milena/mln/core/site_set/p_vertices.hh             |    4 +-
 milena/mln/opt/element.hh                          |    4 ++-
 milena/mln/value/builtin/carrays.hh                |    5 ++-
 16 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog
index 77e5cc3..8226e1b 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,28 @@
+2011-04-28  Guillaume Lazzara  <lazzara@lrde.epita.fr>
+
+	Fix warnings with clang 1.1
+
+	* mln/accu/line.hh: Use def::coord.
+
+	* mln/algebra/vec.hh,
+	* mln/convert/from_to.hxx,
+	* mln/core/image/dmorph/sub_image.hh,
+	* mln/core/internal/site_set_iterator_base.hh,
+	* mln/core/site_set/box.hh,
+	* mln/core/site_set/p_array.hh,
+	* mln/core/site_set/p_edges.hh,
+	* mln/core/site_set/p_vertices.hh: Make forward declaration
+	consistent with declaration.
+
+	* mln/value/builtin/carrays.hh: Explicitly convert to char *.
+
+	* mln/convert/impl/from_double_to_value.hh,
+	* mln/convert/impl/from_int_to_value.hh,
+	* mln/core/point.hh,
+	* mln/opt/element.hh: Avoid unused variable warning.
+
+	* mln/convert/impl/from_image_to_site_set.hh: Remove useless local variable.
+
 2010-12-10  Roland Levillain  <roland@lrde.epita.fr>
 
 	Ensure non implemented reconstructions on sets abort at run time.
diff --git a/milena/mln/accu/line.hh b/milena/mln/accu/line.hh
index c6022ef..75be6b3 100644
--- a/milena/mln/accu/line.hh
+++ b/milena/mln/accu/line.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -63,8 +64,8 @@ namespace mln
 	      typename I, typename O>
     void
     line(const Image<I>& input,
-	 const mln_site(I)& p_start, unsigned len,
-	 unsigned half_length,
+	 const mln_site(I)& p_start, def::coord len,
+	 def::coord half_length,
 	 Image<O>& output);
 
 
@@ -98,7 +99,7 @@ namespace mln
 	mln_precondition(input.is_valid());
 	mln_precondition(output.is_valid());
       }
-      
+
     } // end of namespace mln::accu::internal
 
 
@@ -107,7 +108,7 @@ namespace mln
 
       namespace generic
       {
-	
+
 	template <typename Meta_Accu, unsigned Dir,
 		  typename I, typename O>
 	void
@@ -212,8 +213,8 @@ namespace mln
 		typename I, typename O>
       void
       line_fastest(const Image<I>& input_,
-		   const mln_site(I)& p_start, unsigned len,
-		   unsigned half_length,
+		   const mln_site(I)& p_start, def::coord len,
+		   def::coord half_length,
 		   Image<O>& output_)
       {
 	typedef mln_site(I)  P;
@@ -371,7 +372,7 @@ namespace mln
 				      half_length,
 				      output);
       }
-      
+
     } // end of namespace mln::accu::internal
 
 
diff --git a/milena/mln/algebra/vec.hh b/milena/mln/algebra/vec.hh
index 22ebc02..dc526ec 100644
--- a/milena/mln/algebra/vec.hh
+++ b/milena/mln/algebra/vec.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2006, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2006, 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -55,7 +56,7 @@ namespace mln
   // Forward declarations.
   namespace algebra {
     template <unsigned n, typename T> class vec;
-    template <unsigned d, typename C> class h_vec;
+    template <unsigned d, typename C> struct h_vec;
     template <unsigned n, unsigned m, typename T> class mat;
   }
 
diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx
index f4f690d..95c35a8 100644
--- a/milena/mln/convert/from_to.hxx
+++ b/milena/mln/convert/from_to.hxx
@@ -1,4 +1,5 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -68,7 +69,7 @@ namespace mln
 
   namespace algebra {
     template <unsigned n, typename T> class vec;
-    template <unsigned d, typename C> class h_vec;
+    template <unsigned d, typename C> struct h_vec;
   }
 
   namespace fun {
diff --git a/milena/mln/convert/impl/from_double_to_value.hh b/milena/mln/convert/impl/from_double_to_value.hh
index de766df..fa72059 100644
--- a/milena/mln/convert/impl/from_double_to_value.hh
+++ b/milena/mln/convert/impl/from_double_to_value.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory
+// (LRDE)
 //
 // This file is part of Olena.
 //
@@ -89,6 +90,8 @@ namespace mln
 	from_double_to_value(const double&	      from,
 			    Value<V>&		      to)
 	{
+	  (void) from;
+	  (void) to;
 	  mlc_abort(V)::check();
 	}
 
diff --git a/milena/mln/convert/impl/from_image_to_site_set.hh b/milena/mln/convert/impl/from_image_to_site_set.hh
index 2bdbcff..65873b6 100644
--- a/milena/mln/convert/impl/from_image_to_site_set.hh
+++ b/milena/mln/convert/impl/from_image_to_site_set.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -107,7 +108,6 @@ namespace mln
 			       const std::pair< mln_value(I), p_run<P> >&)
 	{
 	  s.clear();
-	  mln_value(I) O = literal::zero;
 	  mln_fwd_piter(I) p(input.domain());
 	  p.start();
 	  for (;;)
diff --git a/milena/mln/convert/impl/from_int_to_value.hh b/milena/mln/convert/impl/from_int_to_value.hh
index 30840b3..bc83bf4 100644
--- a/milena/mln/convert/impl/from_int_to_value.hh
+++ b/milena/mln/convert/impl/from_int_to_value.hh
@@ -76,6 +76,8 @@ namespace mln
 	from_int_to_value(const int&		    from,
 			  Value<V>&		    to)
 	{
+	  (void) from;
+	  (void) to;
 	  mlc_abort(V)::check();
 	}
 
diff --git a/milena/mln/core/image/dmorph/sub_image.hh b/milena/mln/core/image/dmorph/sub_image.hh
index 9155b09..6256880 100644
--- a/milena/mln/core/image/dmorph/sub_image.hh
+++ b/milena/mln/core/image/dmorph/sub_image.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -43,7 +44,7 @@ namespace mln
 
 
   // Forward declaration.
-  template <typename I, typename S> class sub_image;
+  template <typename I, typename S> struct sub_image;
 
 
   namespace internal
diff --git a/milena/mln/core/internal/site_set_iterator_base.hh b/milena/mln/core/internal/site_set_iterator_base.hh
index 66c94d5..71c3fe3 100644
--- a/milena/mln/core/internal/site_set_iterator_base.hh
+++ b/milena/mln/core/internal/site_set_iterator_base.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -114,8 +115,9 @@ namespace mln
     template <typename S, typename E>
     inline
     void
-    site_set_iterator_base<S, E>::change_target_(const S& /* s */)
+    site_set_iterator_base<S, E>::change_target_(const S& s)
     {
+      (void) s;
       // Empty by default.
     }
 
diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh
index df1fc2c..c4d1a73 100644
--- a/milena/mln/core/point.hh
+++ b/milena/mln/core/point.hh
@@ -1,5 +1,5 @@
-// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
-// Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and
+// Development Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -669,6 +669,7 @@ namespace mln
   const util::yes&
   cut_(const point<grid::tick,C>& p)
   {
+    (void) p;
     util::yes* the_;
     return *the_;
   }
diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh
index c061321..11715b9 100644
--- a/milena/mln/core/site_set/box.hh
+++ b/milena/mln/core/site_set/box.hh
@@ -1,5 +1,5 @@
-// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
-// Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and
+// Development Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -44,8 +44,8 @@ namespace mln
 
   // Fwd decls.
   template <typename P> struct box;
-  template <typename P> struct box_fwd_piter_;
-  template <typename P> struct box_bkd_piter_;
+  template <typename P> class box_fwd_piter_;
+  template <typename P> class box_bkd_piter_;
 
 
   namespace trait
diff --git a/milena/mln/core/site_set/p_array.hh b/milena/mln/core/site_set/p_array.hh
index 218a95a..36129f9 100644
--- a/milena/mln/core/site_set/p_array.hh
+++ b/milena/mln/core/site_set/p_array.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -52,8 +53,8 @@ namespace mln
   template <typename P> class  p_array;
 
   template <typename S> class  p_indexed_psite;
-  template <typename S> struct p_indexed_fwd_piter;
-  template <typename S> struct p_indexed_bkd_piter;
+  template <typename S> class p_indexed_fwd_piter;
+  template <typename S> class p_indexed_bkd_piter;
 
 
 
diff --git a/milena/mln/core/site_set/p_edges.hh b/milena/mln/core/site_set/p_edges.hh
index 4c58696..b4f1d27 100644
--- a/milena/mln/core/site_set/p_edges.hh
+++ b/milena/mln/core/site_set/p_edges.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009, 2011 EPITA Research and Development
+// Laboratory (LRDE)
 //
 // This file is part of Olena.
 //
@@ -45,7 +46,7 @@ namespace mln
 {
 
   // Forward declaration.
-  template <typename G, typename F> struct p_edges;
+  template <typename G, typename F> class p_edges;
 
 
   namespace trait
diff --git a/milena/mln/core/site_set/p_vertices.hh b/milena/mln/core/site_set/p_vertices.hh
index c8497c0..6efa1a9 100644
--- a/milena/mln/core/site_set/p_vertices.hh
+++ b/milena/mln/core/site_set/p_vertices.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2011 EPITA Research and Development Laboratory
 // (LRDE)
 //
 // This file is part of Olena.
@@ -44,7 +44,7 @@ namespace mln
 {
 
   // Forward declaration.
-  template <typename G, typename F> struct p_vertices;
+  template <typename G, typename F> class p_vertices;
 
 
   namespace trait
diff --git a/milena/mln/opt/element.hh b/milena/mln/opt/element.hh
index cec8ebe..f572349 100644
--- a/milena/mln/opt/element.hh
+++ b/milena/mln/opt/element.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory
+// (LRDE)
 //
 // This file is part of Olena.
 //
@@ -84,6 +85,7 @@ namespace mln
       mln_lvalue(I) element_impl(trait::image::category::domain_morpher,
                                  Image<I>& ima, unsigned index)
       {
+	(void) index;
         return element(*exact(ima).delegatee_());
       }
 
diff --git a/milena/mln/value/builtin/carrays.hh b/milena/mln/value/builtin/carrays.hh
index a245683..3ad2721 100644
--- a/milena/mln/value/builtin/carrays.hh
+++ b/milena/mln/value/builtin/carrays.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory
+// (LRDE)
 //
 // This file is part of Olena.
 //
@@ -69,7 +70,7 @@ namespace mln
       {
 	std::ostringstream s;
 	s << value_<T>::name() << '[' << n << ']';
-	return s.str();
+	return s.str().c_str();
       }
     };
 
-- 
1.5.6.5

    