From 855e2544ed3cee7134e3f4245e266e700aa85188 Mon Sep 17 00:00:00 2001
From: Michael Stevens <mail@michael-stevens.de>
Date: Fri, 17 Sep 2004 09:19:31 +0000
Subject: [PATCH] DR45 for expression accessors

---
 .../boost/numeric/ublas/matrix_expression.hpp | 22 +++++++++++++++++++
 .../boost/numeric/ublas/vector_expression.hpp |  8 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/include/boost/numeric/ublas/matrix_expression.hpp b/include/boost/numeric/ublas/matrix_expression.hpp
index 8387b687..4f76ff63 100644
--- a/include/boost/numeric/ublas/matrix_expression.hpp
+++ b/include/boost/numeric/ublas/matrix_expression.hpp
@@ -242,7 +242,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e_.size2 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors - const correct
         BOOST_UBLAS_INLINE
         const refered_type &expression () const {
@@ -519,7 +521,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e2_.size ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -1045,7 +1049,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e_.size2 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression_closure_type &expression () const {
@@ -1523,7 +1529,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e_.size1 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression_closure_type &expression () const {
@@ -1979,7 +1987,9 @@ namespace boost { namespace numeric { namespace ublas {
             return BOOST_UBLAS_SAME (e1_.size2 (), e2_.size2 ());
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -2733,7 +2743,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e2_.size2 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -3192,7 +3204,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e1_.size2 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -3656,7 +3670,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e1_.size1 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -4058,7 +4074,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e2_.size2 (); 
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -4466,7 +4484,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e2_.size2 ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression1_closure_type &expression1 () const {
@@ -5154,7 +5174,9 @@ namespace boost { namespace numeric { namespace ublas {
         matrix_scalar_unary (const expression_type &e):
             e_ (e) {}
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression_closure_type &expression () const {
diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp
index eb1e810c..733f0a54 100644
--- a/include/boost/numeric/ublas/vector_expression.hpp
+++ b/include/boost/numeric/ublas/vector_expression.hpp
@@ -243,7 +243,9 @@ namespace boost { namespace numeric { namespace ublas {
             return expression ().size ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors - const correct
         BOOST_UBLAS_INLINE
         const refered_type &expression () const {
@@ -475,7 +477,9 @@ namespace boost { namespace numeric { namespace ublas {
             return e_.size ();
         }
 
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
         // Expression accessors
         BOOST_UBLAS_INLINE
         const expression_closure_type &expression () const {
@@ -1663,8 +1667,10 @@ namespace boost { namespace numeric { namespace ublas {
         vector_scalar_unary (const expression_type &e):
             e_ (e) {}
 
-        // Expression accessors
+#ifndef BOOST_UBLAS_NESTED_CLASS_DR45
     private:
+#endif
+        // Expression accessors
         BOOST_UBLAS_INLINE
         const expression_closure_type &expression () const {
             return e_;