10.32: Fix compilation with g++-3.4

14 Oct 2003

friend ne supporte pas les typedefs, il lui faut le nom du type.

Index: olena/ChangeLog
from  Nicolas Burrus  <burrus_n@lrde.epita.fr>

	* oln/core/dpoint1d.hh, oln/core/dpoint2d.hh,
	* oln/core/dpoint3d.hh, oln/core/abstract/iter1d.hh,
	* oln/core/abstract/iter2d.hh, oln/core/abstract/iter3d.hh,
	* oln/core/point1d.hh, oln/core/point2d.hh, oln/core/point3d.hh,
	* oln/core/impl/image_array.hh, oln/core/impl/image_array3d.hh,
	* oln/core/impl/image_array2d.hh, oln/core/impl/image_array1d.h:
	Don't use typedefs with the friend specifier.

Index: olena/oln/core/dpoint1d.hh

--- olena/oln/core/dpoint1d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/d/27_dpoint1d.h 1.12 640)
+++ olena/oln/core/dpoint1d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/d/27_dpoint1d.h 1.12 640)
@@ -56,7 +56,7 @@
 
     typedef abstract::dpoint<dpoint1d> super_type;
 
-    friend class super_type;
+    friend class abstract::dpoint<dpoint1d>;
 
     dpoint1d();
 
Index: olena/oln/core/dpoint2d.hh
--- olena/oln/core/dpoint2d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/d/25_dpoint2d.h 1.11 640)
+++ olena/oln/core/dpoint2d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/d/25_dpoint2d.h 1.11 640)
@@ -53,7 +53,7 @@
 
     typedef abstract::dpoint< dpoint2d > super_type;
 
-    friend class super_type;
+    friend class abstract::dpoint< dpoint2d >;
 
     dpoint2d();
 
Index: olena/oln/core/dpoint3d.hh
--- olena/oln/core/dpoint3d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/d/23_dpoint3d.h 1.11 640)
+++ olena/oln/core/dpoint3d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/d/23_dpoint3d.h 1.11 640)
@@ -53,7 +53,7 @@
 
     typedef abstract::dpoint< dpoint3d > super_type;
 
-    friend class super_type;
+    friend class abstract::dpoint< dpoint3d >;
 
     dpoint3d();
 
Index: olena/oln/core/abstract/iter1d.hh
--- olena/oln/core/abstract/iter1d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/d/10_iter1d.hh 1.15 640)
+++ olena/oln/core/abstract/iter1d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/d/10_iter1d.hh 1.15 640)
@@ -62,7 +62,7 @@
     public:
 
       typedef iter<Exact> super_type;
-      friend class super_type;
+      friend class iter<Exact>;
 
       coord 
       col() const
Index: olena/oln/core/abstract/iter2d.hh
--- olena/oln/core/abstract/iter2d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/d/9_iter2d.hh 1.15 640)
+++ olena/oln/core/abstract/iter2d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/d/9_iter2d.hh 1.15 640)
@@ -64,7 +64,7 @@
     public:
 
       typedef iter<Exact> super_type;
-      friend class super_type;
+      friend class iter<Exact>;
 
       coord 
       row() const
Index: olena/oln/core/abstract/iter3d.hh
--- olena/oln/core/abstract/iter3d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/d/8_iter3d.hh 1.15 640)
+++ olena/oln/core/abstract/iter3d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/d/8_iter3d.hh 1.15 640)
@@ -64,7 +64,7 @@
     public:
 
       typedef iter<Exact> super_type;
-      friend class super_type;
+      friend class iter<Exact>;
 
       coord 
       slice() const
Index: olena/oln/core/point1d.hh
--- olena/oln/core/point1d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/c/32_point1d.hh 1.13 640)
+++ olena/oln/core/point1d.hh Fri, 10 Oct 2003 15:52:35 +0200 burrus_n (oln/c/32_point1d.hh 1.13 640)
@@ -55,7 +55,7 @@
     typedef abstract::point<point1d>	super_type;
     typedef point_traits<point1d>::dpoint_type dpoint_type;
 
-    friend class super_type;
+    friend class abstract::point<point1d>;
 
     point1d();
 
Index: olena/oln/core/point2d.hh
--- olena/oln/core/point2d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/c/30_point2d.hh 1.11 640)
+++ olena/oln/core/point2d.hh Fri, 10 Oct 2003 15:52:35 +0200 burrus_n (oln/c/30_point2d.hh 1.11 640)
@@ -53,7 +53,7 @@
     typedef abstract::point< point2d >	super_type;
     typedef point_traits<point2d>::dpoint_type dpoint_type;
 
-    friend class super_type;
+    friend class abstract::point< point2d >;
 
     point2d();
 
Index: olena/oln/core/point3d.hh
--- olena/oln/core/point3d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/c/28_point3d.hh 1.13 640)
+++ olena/oln/core/point3d.hh Fri, 10 Oct 2003 15:52:35 +0200 burrus_n (oln/c/28_point3d.hh 1.13 640)
@@ -54,7 +54,7 @@
     typedef abstract::point< point3d >	super_type;
     typedef point_traits<point3d>::dpoint_type dpoint_type;
 
-    friend class super_type;
+    friend class abstract::point< point3d >;
 
     point3d();
 
Index: olena/oln/core/impl/image_array.hh
--- olena/oln/core/impl/image_array.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/t/30_image_arra 1.13 640)
+++ olena/oln/core/impl/image_array.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/t/30_image_arra 1.13 640)
@@ -84,7 +84,7 @@
 
       enum { dim = impl_traits<Exact>::dim };
 
-      friend class super_type;
+      friend class image_impl<Exact>;
 
       image_array(const size_type& s): super_type(s), buffer_(0)
       {
Index: olena/oln/core/impl/image_array3d.hh
--- olena/oln/core/impl/image_array3d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/t/32_image_arra 1.9 640)
+++ olena/oln/core/impl/image_array3d.hh Fri, 10 Oct 2003 15:52:35 +0200 burrus_n (oln/t/32_image_arra 1.9 640)
@@ -112,7 +112,7 @@
       
 
       friend class image_impl<image_array3d<T> >;
-      friend class super_type;
+      friend class image_array<T, image_array3d<T> >;
 
       image_array3d(const size_type& s): super_type(s) 
       {
Index: olena/oln/core/impl/image_array2d.hh
--- olena/oln/core/impl/image_array2d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/t/33_image_arra 1.10 640)
+++ olena/oln/core/impl/image_array2d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/t/33_image_arra 1.10 640)
@@ -98,7 +98,7 @@
  
 
       friend class image_impl<image_array2d<T> >;
-      friend class super_type;
+      friend class image_array<T, image_array2d<T> >;
 
       image_array2d(const size_type& s): super_type(s) 
       {
Index: olena/oln/core/impl/image_array1d.hh
--- olena/oln/core/impl/image_array1d.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/t/34_image_arra 1.11 640)
+++ olena/oln/core/impl/image_array1d.hh Fri, 10 Oct 2003 15:52:34 +0200 burrus_n (oln/t/34_image_arra 1.11 640)
@@ -77,7 +77,7 @@
       
 
       friend class image_impl<image_array1d<T> >;
-      friend class super_type;
+      friend class image_array<T, image_array1d<T> >;
 
       image_array1d(const size_type& s): super_type(s)
       {

    

Nicolas Burrus

tags

participants (1)