--- /u/004/dsorkin/matrix_proxy.hpp	Sat Mar 24 22:41:26 2007
+++ matrix_proxy.hpp	Sat Mar 24 22:31:29 2007
@@ -195,11 +195,13 @@
                 vector_swap<scalar_swap> (*this, mr);
             }
         }
-        BOOST_UBLAS_INLINE
-        friend void swap (matrix_row mr1, matrix_row mr2) {
-            mr1.swap (mr2);
-        }
 
+        friend void swap (matrix_row mr1, matrix_row mr2);
+        // BOOST_UBLAS_INLINE
+        // friend void swap (matrix_row mr1, matrix_row mr2) {
+        //     mr1.swap (mr2);
+        // }
+
         // Iterator types
     private:
         typedef typename M::const_iterator2 const_subiterator_type;
@@ -455,6 +457,14 @@
         size_type i_;
     };
 
+    template<typename M>
+    BOOST_UBLAS_INLINE
+    void swap (matrix_row<M> mr1, matrix_row<M> mr2) {
+        mr1.swap (mr2);
+    }
+
+
+
     // Projections
     template<class M>
     BOOST_UBLAS_INLINE
@@ -461,11 +471,15 @@
     matrix_row<M> row (M &data, typename M::size_type i) {
         return matrix_row<M> (data, i);
     }
-    template<class M>
-    BOOST_UBLAS_INLINE
-    const matrix_row<const M> row (const M &data, typename M::size_type i) {
-        return matrix_row<const M> (data, i);
-    }
+    //
+    // Redundant here
+    //
+    // template<class M>
+    // BOOST_UBLAS_INLINE
+    // const matrix_row<const M> row (const M &data, typename M::size_type i) {
+    //     return matrix_row<const M> (data, i);
+    // }
+    //