From c2c8d010814cbd18cbe26e601e49201b02f1ffe8 Mon Sep 17 00:00:00 2001
From: Michael Stevens <mail@michael-stevens.de>
Date: Wed, 22 Sep 2004 07:58:12 +0000
Subject: [PATCH] fix swap

---
 include/boost/numeric/ublas/matrix_proxy.hpp | 16 ++++++++--------
 include/boost/numeric/ublas/vector_proxy.hpp |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/boost/numeric/ublas/matrix_proxy.hpp b/include/boost/numeric/ublas/matrix_proxy.hpp
index 8a270a79..ae2337cf 100644
--- a/include/boost/numeric/ublas/matrix_proxy.hpp
+++ b/include/boost/numeric/ublas/matrix_proxy.hpp
@@ -206,7 +206,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == mr.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), mr.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, mr);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, mr);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -714,7 +714,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == mc.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), mc.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, mc);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, mc);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -1231,7 +1231,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == mvr.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), mvr.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, mvr);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, mvr);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -1738,7 +1738,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == mvs.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), mvs.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, mvs);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, mvs);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -2246,7 +2246,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == mvi.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), mvi.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, mvi);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, mvi);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -2749,7 +2749,7 @@ namespace boost { namespace numeric { namespace ublas {
             if (this != &mr) {
                 BOOST_UBLAS_CHECK (size1 () == mr.size1 (), bad_size ());
                 BOOST_UBLAS_CHECK (size2 () == mr.size2 (), bad_size ());
-                matrix_swap (scalar_swap<reference, reference> (), *this, mr);
+                matrix_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator1::reference, BOOST_UBLAS_TYPENAME iterator1::reference> (), *this, mr);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -3691,7 +3691,7 @@ namespace boost { namespace numeric { namespace ublas {
             if (this != &ms) {
                 BOOST_UBLAS_CHECK (size1 () == ms.size1 (), bad_size ());
                 BOOST_UBLAS_CHECK (size2 () == ms.size2 (), bad_size ());
-                matrix_swap (scalar_swap<reference, reference> (), *this, ms);
+                matrix_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator1::reference, BOOST_UBLAS_TYPENAME iterator1::reference> (), *this, ms);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -4647,7 +4647,7 @@ namespace boost { namespace numeric { namespace ublas {
             if (this != &mi) {
                 BOOST_UBLAS_CHECK (size1 () == mi.size1 (), bad_size ());
                 BOOST_UBLAS_CHECK (size2 () == mi.size2 (), bad_size ());
-                matrix_swap (scalar_swap<reference, reference> (), *this, mi);
+                matrix_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator1::reference, BOOST_UBLAS_TYPENAME iterator1::reference> (), *this, mi);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
diff --git a/include/boost/numeric/ublas/vector_proxy.hpp b/include/boost/numeric/ublas/vector_proxy.hpp
index d2e1974b..8d8c3724 100644
--- a/include/boost/numeric/ublas/vector_proxy.hpp
+++ b/include/boost/numeric/ublas/vector_proxy.hpp
@@ -223,7 +223,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == vr.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), vr.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, vr);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, vr);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -770,7 +770,7 @@ namespace boost { namespace numeric { namespace ublas {
                 BOOST_UBLAS_CHECK (size () == vs.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), vs.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, vs);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, vs);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS
@@ -1326,7 +1326,7 @@ return true;
                 BOOST_UBLAS_CHECK (size () == vi.size (), bad_size ());
                 // Sparse ranges may be nonconformant now.
                 // std::swap_ranges (begin (), end (), vi.begin ());
-                vector_swap (scalar_swap<reference, reference> (), *this, vi);
+                vector_swap (scalar_swap<BOOST_UBLAS_TYPENAME iterator::reference, BOOST_UBLAS_TYPENAME iterator::reference> (), *this, vi);
             }
         }
 #ifndef BOOST_UBLAS_NO_MEMBER_FRIENDS