[boost] ublas on VisualAge

From: Toon Knapen (toon.knapen_at_[hidden])
Date: 2002-09-06 16:18:25

I just ported ublas to IBM/Aix/VisualAge and needed following patches.

Mainly VACPP does not like following statement :
  typedef iterator< const something > iterator ;
saying that iterator is already defined.

I compiled/tested these patches on gcc / icc and of course vacpp.

Here they are :

--- matrix_assign.hpp	Fri Sep  6 22:20:51 2002
+++ /home/tk/boost/boost_import/boost/boost/numeric/ublas/matrix_assign.hpp	
Tue
 Aug  6 09:18:25 2002
@@ -1778,7 +1778,7 @@
                 ++ it1;
             }
 #ifdef BOOST_UBLAS_TYPE_CHECK
-            BOOST_UBLAS_CHECK (boost::numeric::ublas::equals (m, cm),
 external_logic ());
+            BOOST_UBLAS_CHECK (equals (m, cm), external_logic ());
 #endif
 #endif
         }
--- matrix.hpp	Fri Sep  6 22:34:55 2002
+++ /home/tk/boost/boost_import/boost/boost/numeric/ublas/matrix.hpp	Tue Aug  
6
 09:18:25 2002
@@ -279,9 +279,9 @@
         typedef reverse_iterator2<iterator2, value_type, reference>
 reverse_iterator2;
 #else
         typedef reverse_iterator1<const_iterator1> const_reverse_iterator1;
-        typedef reverse_iterator1<iterator1> reverse_iterator1_iterator1;
+        typedef reverse_iterator1<iterator1> reverse_iterator1;
         typedef reverse_iterator2<const_iterator2> const_reverse_iterator2;
-        typedef reverse_iterator2<iterator2> reverse_iterator2_iterator2;
+        typedef reverse_iterator2<iterator2> reverse_iterator2;
 #endif
 #endif

@@ -513,7 +513,7 @@
             typedef typename matrix::pointer pointer;
 #endif
             typedef iterator2 dual_iterator_type;
-            typedef reverse_iterator2_iterator2 dual_reverse_iterator_type;
+            typedef reverse_iterator2 dual_reverse_iterator_type;

             // Construction and destruction
             BOOST_UBLAS_INLINE
@@ -568,12 +568,12 @@
                 return m.find_last2 (1, index1 (), m.size2 ());
             }
             BOOST_UBLAS_INLINE
-            reverse_iterator2_iterator2 rbegin () const {
-                return reverse_iterator2_iterator2 (end ());
+            reverse_iterator2 rbegin () const {
+                return reverse_iterator2 (end ());
             }
             BOOST_UBLAS_INLINE
-            reverse_iterator2_iterator2 rend () const {
-                return reverse_iterator2_iterator2 (begin ());
+            reverse_iterator2 rend () const {
+                return reverse_iterator2 (begin ());
             }

             // Indices
@@ -768,7 +768,7 @@
             typedef typename matrix::pointer pointer;
 #endif
             typedef iterator1 dual_iterator_type;
-            typedef reverse_iterator1_iterator1 dual_reverse_iterator_type; 
+            typedef reverse_iterator1 dual_reverse_iterator_type;

             // Construction and destruction
             BOOST_UBLAS_INLINE
@@ -823,12 +823,12 @@
                 return m.find_last1 (1, m.size1 (), index2 ());  
             }
             BOOST_UBLAS_INLINE
-            reverse_iterator1_iterator1 rbegin () const {
-                return reverse_iterator1_iterator1 (end ());
+            reverse_iterator1 rbegin () const {
+                return reverse_iterator1 (end ()); 
             }
             BOOST_UBLAS_INLINE
-            reverse_iterator1_iterator1 rend () const {
-                return reverse_iterator1_iterator1 (begin ());
+            reverse_iterator1 rend () const {
+                return reverse_iterator1 (begin ());
             } 

             // Indices 
@@ -891,12 +891,12 @@
         } 

         BOOST_UBLAS_INLINE 
-        reverse_iterator1_iterator1 rbegin1 () {
-            return reverse_iterator1_iterator1 (end1 ());
+        reverse_iterator1 rbegin1 () { 
+            return reverse_iterator1 (end1 ());
         } 
         BOOST_UBLAS_INLINE
-        reverse_iterator1_iterator1 rend1 () { 
-            return reverse_iterator1_iterator1 (begin1 ());
+        reverse_iterator1 rend1 () { 
+            return reverse_iterator1 (begin1 ());
         } 

         BOOST_UBLAS_INLINE 
@@ -909,12 +909,12 @@
         } 

         BOOST_UBLAS_INLINE 
-        reverse_iterator2_iterator2 rbegin2 () {
-            return reverse_iterator2_iterator2 (end2 ()); 
+        reverse_iterator2 rbegin2 () {
+            return reverse_iterator2 (end2 ()); 
         }
         BOOST_UBLAS_INLINE
-        reverse_iterator2_iterator2 rend2 () {
-            return reverse_iterator2_iterator2 (begin2 ()); 
+        reverse_iterator2 rend2 () {
+            return reverse_iterator2 (begin2 ());
         }
  
     private:
--- matrix_proxy.hpp	Fri Sep  6 22:27:31 2002
+++ /home/tk/boost/boost_import/boost/boost/numeric/ublas/matrix_proxy.hpp	Tue
 Aug  6 09:18:25 2002
@@ -482,16 +482,16 @@
 #ifdef BOOST_MSVC_STD_ITERATOR
         typedef reverse_iterator<iterator, value_type, reference>
 reverse_iterator;
 #else
-        typedef reverse_iterator<iterator> reverse_iterator_iterator;
+        typedef reverse_iterator<iterator> reverse_iterator;
 #endif
  
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rbegin () {
-            return reverse_iterator_iterator (end ());
+        reverse_iterator rbegin () {
+            return reverse_iterator (end ()); 
         }
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rend () {
-            return reverse_iterator_iterator (begin ());
+        reverse_iterator rend () {
+            return reverse_iterator (begin ()); 
         }

     private:
@@ -1214,16 +1214,16 @@
 #ifdef BOOST_MSVC_STD_ITERATOR 
         typedef reverse_iterator<iterator, value_type, reference>
 reverse_iterator;
 #else
-        typedef reverse_iterator<iterator> reverse_iterator_iterator;
+        typedef reverse_iterator<iterator> reverse_iterator;
 #endif

         BOOST_UBLAS_INLINE 
-        reverse_iterator_iterator rbegin () {
-            return reverse_iterator_iterator (end ());
+        reverse_iterator rbegin () {
+            return reverse_iterator (end ());
         } 
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rend () {
-            return reverse_iterator_iterator (begin ());
+        reverse_iterator rend () { 
+            return reverse_iterator (begin ());
         }
  
     private:
@@ -3111,9 +3111,9 @@
         typedef reverse_iterator2<iterator2, value_type, reference>
 reverse_iterator2;
 #else 
         typedef reverse_iterator1<const_iterator1> const_reverse_iterator1;
-        typedef reverse_iterator1<iterator1> reverse_iterator1_iterator1;
+        typedef reverse_iterator1<iterator1> reverse_iterator1; 
         typedef reverse_iterator2<const_iterator2> const_reverse_iterator2;
-        typedef reverse_iterator2<iterator2> reverse_iterator2_iterator2; 
+        typedef reverse_iterator2<iterator2> reverse_iterator2;
 #endif 
 #endif
  
@@ -3367,7 +3367,7 @@
             typedef typename M::iterator1::reference reference;
             typedef typename M::iterator1::pointer pointer;
             typedef iterator2 dual_iterator_type; 
-            typedef reverse_iterator2_iterator2 dual_reverse_iterator_type;
+            typedef reverse_iterator2 dual_reverse_iterator_type; 

             // Construction and destruction 
             BOOST_UBLAS_INLINE
@@ -3420,12 +3420,12 @@
                 return mr.find_last2 (1, index1 (), mr.size2 ());
             } 
             BOOST_UBLAS_INLINE
-            reverse_iterator2_iterator2 rbegin () const { 
-                return reverse_iterator2_iterator2 (end ());
+            reverse_iterator2 rbegin () const {
+                return reverse_iterator2 (end ()); 
             }
             BOOST_UBLAS_INLINE
-            reverse_iterator2_iterator2 rend () const { 
-                return reverse_iterator2_iterator2 (begin ());
+            reverse_iterator2 rend () const {
+                return reverse_iterator2 (begin ());
             } 

             // Indices 
@@ -3616,7 +3616,7 @@
             typedef typename M::iterator2::reference reference;
             typedef typename M::iterator2::pointer pointer;
             typedef iterator1 dual_iterator_type;
-            typedef reverse_iterator1_iterator1 dual_reverse_iterator_type; 
+            typedef reverse_iterator1 dual_reverse_iterator_type;
  
             // Construction and destruction
             BOOST_UBLAS_INLINE 
@@ -3669,12 +3669,12 @@
                 return mr.find_last1 (1, mr.size1 (), index2 ()); 
             }
             BOOST_UBLAS_INLINE 
-            reverse_iterator1_iterator1 rbegin () const {
-                return reverse_iterator1_iterator1 (end ()); 
+            reverse_iterator1 rbegin () const {
+                return reverse_iterator1 (end ()); 
             }
             BOOST_UBLAS_INLINE 
-            reverse_iterator1_iterator1 rend () const {
-                return reverse_iterator1_iterator1 (begin ()); 
+            reverse_iterator1 rend () const {
+                return reverse_iterator1 (begin ()); 
             }
  
             // Indices
@@ -3735,12 +3735,12 @@
         }
  
         BOOST_UBLAS_INLINE
-        reverse_iterator1_iterator1 rbegin1 () { 
-            return reverse_iterator1_iterator1 (end1 ());
+        reverse_iterator1 rbegin1 () { 
+            return reverse_iterator1 (end1 ());
         } 
         BOOST_UBLAS_INLINE
-        reverse_iterator1_iterator1 rend1 () { 
-            return reverse_iterator1_iterator1 (begin1 ());
+        reverse_iterator1 rend1 () { 
+            return reverse_iterator1 (begin1 ());
         }
  
         BOOST_UBLAS_INLINE
@@ -3753,12 +3753,12 @@
         }

         BOOST_UBLAS_INLINE
-        reverse_iterator2_iterator2 rbegin2 () { 
-            return reverse_iterator2_iterator2 (end2 ());
+        reverse_iterator2 rbegin2 () {
+            return reverse_iterator2 (end2 ()); 
         }
         BOOST_UBLAS_INLINE
-        reverse_iterator2_iterator2 rend2 () { 
-            return reverse_iterator2_iterator2 (begin2 ());
+        reverse_iterator2 rend2 () { 
+            return reverse_iterator2 (begin2 ());
         } 

     private: 
@@ -4013,9 +4013,9 @@
         typedef reverse_iterator2<iterator2, value_type, reference>
 reverse_iterator2;
 #else
         typedef reverse_iterator1<const_iterator1> const_reverse_iterator1;
-        typedef reverse_iterator1<iterator1> reverse_iterator1_iterator1;
+        typedef reverse_iterator1<iterator1> reverse_iterator1;
         typedef reverse_iterator2<const_iterator2> const_reverse_iterator2;
-        typedef reverse_iterator2<iterator2> reverse_iterator2_iterator2;
+        typedef reverse_iterator2<iterator2> reverse_iterator2;
 #endif
 #endif

@@ -4261,7 +4261,7 @@
             typedef typename M::iterator1::reference reference;
             typedef typename M::iterator1::pointer pointer;
             typedef iterator2 dual_iterator_type;
-            typedef reverse_iterator2_iterator2 dual_reverse_iterator_type; 
+            typedef reverse_iterator2 dual_reverse_iterator_type;
  
             // Construction and destruction
             BOOST_UBLAS_INLINE 
@@ -4312,12 +4312,12 @@
                 return iterator2 ((*this) (), it1_, it2_ ().end ());  
             }
             BOOST_UBLAS_INLINE 
-            reverse_iterator2_iterator2 rbegin () const {
-                return reverse_iterator2_iterator2 (end ()); 
+            reverse_iterator2 rbegin () const {
+                return reverse_iterator2 (end ()); 
             }
             BOOST_UBLAS_INLINE 
-            reverse_iterator2_iterator2 rend () const {
-                return reverse_iterator2_iterator2 (begin ()); 
+            reverse_iterator2 rend () const {
+                return reverse_iterator2 (begin ()); 
             }
  
             // Indices
@@ -4510,7 +4510,7 @@
             typedef typename M::iterator2::reference reference;
             typedef typename M::iterator2::pointer pointer;
             typedef iterator1 dual_iterator_type;
-            typedef reverse_iterator1_iterator1 dual_reverse_iterator_type; 
+            typedef reverse_iterator1 dual_reverse_iterator_type;
  
             // Construction and destruction
             BOOST_UBLAS_INLINE 
@@ -4561,12 +4561,12 @@
                 return iterator1 ((*this) (), it1_ ().end (), it2_);  
             }
             BOOST_UBLAS_INLINE 
-            reverse_iterator1_iterator1 rbegin () const {
-                return reverse_iterator1_iterator1 (end ()); 
+            reverse_iterator1 rbegin () const {
+                return reverse_iterator1 (end ()); 
             }
             BOOST_UBLAS_INLINE 
-            reverse_iterator1_iterator1 rend () const {
-                return reverse_iterator1_iterator1 (begin ()); 
+            reverse_iterator1 rend () const {
+                return reverse_iterator1 (begin ()); 
             }
  
             // Indices
@@ -4629,12 +4629,12 @@
         }
  
         BOOST_UBLAS_INLINE
-        reverse_iterator1_iterator1 rbegin1 () { 
-            return reverse_iterator1_iterator1 (end1 ());
+        reverse_iterator1 rbegin1 () { 
+            return reverse_iterator1 (end1 ());
         } 
         BOOST_UBLAS_INLINE
-        reverse_iterator1_iterator1 rend1 () { 
-            return reverse_iterator1_iterator1 (begin1 ());
+        reverse_iterator1 rend1 () { 
+            return reverse_iterator1 (begin1 ());
         } 

         BOOST_UBLAS_INLINE 
@@ -4647,12 +4647,12 @@
         } 

         BOOST_UBLAS_INLINE 
-        reverse_iterator2_iterator2 rbegin2 () {
-            return reverse_iterator2_iterator2 (end2 ()); 
+        reverse_iterator2 rbegin2 () {
+            return reverse_iterator2 (end2 ()); 
         }
         BOOST_UBLAS_INLINE 
-        reverse_iterator2_iterator2 rend2 () {
-            return reverse_iterator2_iterator2 (begin2 ());
+        reverse_iterator2 rend2 () { 
+            return reverse_iterator2 (begin2 ());
         } 

     private: 
--- vector.hpp	Fri Sep  6 22:20:51 2002
+++ /home/tk/boost/boost_import/boost/boost/numeric/ublas/vector.hpp	Tue Aug  
6
 09:18:26 2002
@@ -505,16 +505,16 @@
 #ifdef BOOST_MSVC_STD_ITERATOR
         typedef reverse_iterator<iterator, value_type, reference>
 reverse_iterator;
 #else 
-        typedef reverse_iterator<iterator> reverse_iterator_iterator;
+        typedef reverse_iterator<iterator> reverse_iterator; 
 #endif
  
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rbegin () { 
-            return reverse_iterator_iterator (end ());
+        reverse_iterator rbegin () { 
+            return reverse_iterator (end ());
         } 
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rend () { 
-            return reverse_iterator_iterator (begin ());
+        reverse_iterator rend () { 
+            return reverse_iterator (begin ());
         } 

     private: 
--- vector_proxy.hpp	Fri Sep  6 22:20:51 2002
+++ /home/tk/boost/boost_import/boost/boost/numeric/ublas/vector_proxy.hpp	Tue
 Aug  6 09:18:26 2002
@@ -479,16 +479,16 @@
 #ifdef BOOST_MSVC_STD_ITERATOR
         typedef reverse_iterator<iterator, value_type, reference>
 reverse_iterator;
 #else 
-        typedef reverse_iterator<iterator> reverse_iterator_iterator;
+        typedef reverse_iterator<iterator> reverse_iterator; 
 #endif
  
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rbegin () { 
-            return reverse_iterator_iterator (end ());
+        reverse_iterator rbegin () { 
+            return reverse_iterator (end ());
         } 
         BOOST_UBLAS_INLINE
-        reverse_iterator_iterator rend () { 
-            return reverse_iterator_iterator (begin ());
+        reverse_iterator rend () { 
+            return reverse_iterator (begin ());
         } 

     private: