1 files changed, 18 insertions, 18 deletions

diff --git a/boost/numeric/ublas/assignment.hpp b/boost/numeric/ublas/assignment.hpp
index 65ae12d513..d2079e13dc 100644
--- a/boost/numeric/ublas/assignment.hpp
+++ b/boost/numeric/ublas/assignment.hpp
@@ -170,7 +170,7 @@ BOOST_UBLAS_INLINE vector_move_manip<T>  move(T i) {
 *
 * \todo Doxygen has some problems with similar template functions. Correct that.
 */
-template <std::size_t I>
+template <std::ptrdiff_t I>
 class static_vector_move_manip: public index_manipulator<static_vector_move_manip<I> > {
 public:
     template <typename V>
@@ -198,8 +198,8 @@ public:
 *
 * \todo Doxygen has some problems with similar template functions. Correct that.
 */
-template <std::size_t I>
-BOOST_UBLAS_INLINE static_vector_move_manip<I>  move() {
+template <std::ptrdiff_t I>
+static_vector_move_manip<I>  move() {
     return static_vector_move_manip<I>();
 }
 
@@ -269,7 +269,7 @@ BOOST_UBLAS_INLINE matrix_move_to_manip<T>  move_to(T i, T j) {
 *
 * \todo Doxygen has some problems with similar template functions. Correct that.
 */
-template <std::size_t I, std::size_t J>
+template <std::size_t I,std::size_t J>
 class static_matrix_move_to_manip: public index_manipulator<static_matrix_move_to_manip<I, J> > {
 public:
     template <typename V, typename K>
@@ -369,7 +369,7 @@ BOOST_UBLAS_INLINE matrix_move_manip<T>  move(T i, T j) {
 *
 * \todo Doxygen has some problems with similar template functions. Correct that.
 */
-template <std::size_t I, std::size_t J>
+template <std::ptrdiff_t I, std::ptrdiff_t J>
 class static_matrix_move_manip: public index_manipulator<static_matrix_move_manip<I, J> > {
 public:
     template <typename V, typename K>
@@ -407,7 +407,7 @@ public:
 *
 * \todo Doxygen has some problems with similar template functions. Correct that.
 */
-template <std::size_t I, std::size_t J>
+template <std::ptrdiff_t I, std::ptrdiff_t J>
 BOOST_UBLAS_INLINE static_matrix_move_manip<I, J>  move() {
     return static_matrix_move_manip<I, J>();
 }
@@ -451,7 +451,7 @@ public:
 * \endcode
 * \sa begin2()
 */
-BOOST_UBLAS_INLINE begin1_manip  begin1() {
+inline begin1_manip  begin1() {
     return begin1_manip();
 }
 
@@ -495,7 +495,7 @@ public:
 * \endcode
 * \sa begin1() begin2_manip
 */
-BOOST_UBLAS_INLINE begin2_manip  begin2() {
+inline begin2_manip  begin2() {
     return begin2_manip();
 }
 
@@ -540,7 +540,7 @@ public:
 * \endcode
 * \sa next_column()
 */
-BOOST_UBLAS_INLINE next_row_manip  next_row() {
+inline next_row_manip  next_row() {
     return next_row_manip();
 }
 
@@ -584,7 +584,7 @@ public:
 * \endcode
 *
 */
-BOOST_UBLAS_INLINE next_column_manip next_column() {
+inline next_column_manip next_column() {
     return next_column_manip();
 }
 
@@ -804,7 +804,7 @@ namespace traverse_policy {
             l++; j++;
             if (l>=e().size2()) {
                 l=0; k++; j=j0; i++;
-                // It is assumed that the iteration starts from 0 and happens only using this function from within
+                // It is assumed that the iteration starts from 0 and progresses only using this function from within
                 // an assigner object.
                 // Otherwise (i.e. if it is called outside the assigner object) apply2 should have been
                 // outside the if statement.
@@ -850,7 +850,7 @@ namespace traverse_policy {
             k++; i++;
             if (k>=e().size1()) {
                 k=0; l++; i=i0; j++;
-                // It is assumed that the iteration starts from 0 and happens only using this function from within
+                // It is assumed that the iteration starts from 0 and progresses only using this function from within
                 // an assigner object.
                 // Otherwise (i.e. if it is called outside the assigner object) apply2 should have been
                 // outside the if statement.
@@ -885,27 +885,27 @@ namespace traverse_policy {
  // Traverse policy namespace
 namespace traverse_policy {
 
-    by_row_policy<DEFAULT_WRAP_POLICY> by_row() {
+    inline by_row_policy<DEFAULT_WRAP_POLICY> by_row() {
     return by_row_policy<DEFAULT_WRAP_POLICY>();
     }
 
-    by_row_policy<wrap> by_row_wrap() {
+    inline by_row_policy<wrap> by_row_wrap() {
         return by_row_policy<wrap>();
     }
 
-    by_row_policy<no_wrap> by_row_no_wrap() {
+    inline by_row_policy<no_wrap> by_row_no_wrap() {
         return by_row_policy<no_wrap>();
     }
 
-    by_column_policy<DEFAULT_WRAP_POLICY> by_column() {
+    inline by_column_policy<DEFAULT_WRAP_POLICY> by_column() {
         return by_column_policy<DEFAULT_WRAP_POLICY>();
     }
 
-    by_column_policy<wrap> by_column_wrap() {
+    inline by_column_policy<wrap> by_column_wrap() {
         return by_column_policy<wrap>();
     }
 
-    by_column_policy<no_wrap> by_column_no_wrap() {
+    inline by_column_policy<no_wrap> by_column_no_wrap() {
         return by_column_policy<no_wrap>();
     }