From ae42294c58fca5e43238c593c487be8cdfe74b79 Mon Sep 17 00:00:00 2001
From: Gennaro Prota <gennaro.prota@gmail.com>
Date: Thu, 20 Jul 2006 13:41:13 +0000
Subject: [PATCH] manual merge from trunk: fixed typos reported in
 http://bugs.debian.org/378016 (there seems to be no mention of the erroneous
 names in the docs); NOTE(!): license reference text to be fixed; guard macro
 name beginning with underscore

[SVN r34633]
---
 include/boost/numeric/ublas/matrix_expression.hpp | 10 +++++-----
 include/boost/numeric/ublas/vector_expression.hpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/boost/numeric/ublas/matrix_expression.hpp b/include/boost/numeric/ublas/matrix_expression.hpp
index 4576f027..ac86f658 100644
--- a/include/boost/numeric/ublas/matrix_expression.hpp
+++ b/include/boost/numeric/ublas/matrix_expression.hpp
@@ -42,7 +42,7 @@ namespace boost { namespace numeric { namespace ublas {
         typedef typename boost::mpl::if_<boost::is_const<E>,
                                           typename E::const_reference,
                                           typename E::reference>::type reference;
-        typedef E refered_type;
+        typedef E referred_type;
         typedef const self_type const_closure_type;
         typedef self_type closure_type;
         typedef typename E::orientation_category orientation_category;
@@ -50,7 +50,7 @@ namespace boost { namespace numeric { namespace ublas {
 
         // Construction and destruction
         BOOST_UBLAS_INLINE
-        explicit matrix_reference (refered_type &e):
+        explicit matrix_reference (referred_type &e):
               e_ (e) {}
 
         // Accessors
@@ -66,11 +66,11 @@ namespace boost { namespace numeric { namespace ublas {
     public:
         // Expression accessors - const correct
         BOOST_UBLAS_INLINE
-        const refered_type &expression () const {
+        const referred_type &expression () const {
             return e_;
         }
         BOOST_UBLAS_INLINE
-        refered_type &expression () {
+        referred_type &expression () {
             return e_;
         }
 
@@ -269,7 +269,7 @@ namespace boost { namespace numeric { namespace ublas {
         }
 
     private:
-        refered_type &e_;
+        referred_type &e_;
     };
 
 
diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp
index 313f9248..f5588de4 100644
--- a/include/boost/numeric/ublas/vector_expression.hpp
+++ b/include/boost/numeric/ublas/vector_expression.hpp
@@ -43,14 +43,14 @@ namespace boost { namespace numeric { namespace ublas {
         typedef typename boost::mpl::if_<boost::is_const<E>,
                                           typename E::const_reference,
                                           typename E::reference>::type reference;
-        typedef E refered_type;
+        typedef E referred_type;
         typedef const self_type const_closure_type;
         typedef self_type closure_type;
         typedef typename E::storage_category storage_category;
 
         // Construction and destruction
         BOOST_UBLAS_INLINE
-        explicit vector_reference (refered_type &e):
+        explicit vector_reference (referred_type &e):
             e_ (e) {}
 
         // Accessors
@@ -62,11 +62,11 @@ namespace boost { namespace numeric { namespace ublas {
     public:
         // Expression accessors - const correct
         BOOST_UBLAS_INLINE
-        const refered_type &expression () const {
+        const referred_type &expression () const {
             return e_;
         }
         BOOST_UBLAS_INLINE
-        refered_type &expression () {
+        referred_type &expression () {
             return e_;
         }
 
@@ -227,7 +227,7 @@ namespace boost { namespace numeric { namespace ublas {
         }
 
     private:
-        refered_type &e_;
+        referred_type &e_;
     };