From f10bea22e61ee2d457fd35497d595ecbccd7626b Mon Sep 17 00:00:00 2001
From: Michael Stevens <mail@michael-stevens.de>
Date: Mon, 2 Aug 2004 19:38:20 +0000
Subject: [PATCH] Scalar ET's do not work for complex Reverted back to previous
 logic were they were disabled by default

[SVN r24251]
---
 include/boost/numeric/ublas/vector_expression.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp
index 311f0552..b4925a8c 100644
--- a/include/boost/numeric/ublas/vector_expression.hpp
+++ b/include/boost/numeric/ublas/vector_expression.hpp
@@ -1775,7 +1775,9 @@ namespace boost { namespace numeric { namespace ublas {
     template<class E, class F>
     struct vector_scalar_unary_traits {
         typedef vector_scalar_unary<E, F> expression_type;
-#ifndef BOOST_UBLAS_SIMPLE_ET_DEBUG
+#if !defined (BOOST_UBLAS_SIMPLE_ET_DEBUG) && defined (BOOST_UBLAS_USE_SCALAR_ET)
+// FIXME don't define USE_SCALAR_ET other then for testing
+// They do not work for complex types
          typedef expression_type result_type;
 #else
          typedef typename F::result_type result_type;
@@ -1907,7 +1909,9 @@ namespace boost { namespace numeric { namespace ublas {
     template<class E1, class E2, class F>
     struct vector_scalar_binary_traits {
         typedef vector_scalar_binary<E1, E2, F> expression_type;
-#ifndef BOOST_UBLAS_SIMPLE_ET_DEBUG
+#if !defined (BOOST_UBLAS_SIMPLE_ET_DEBUG) && defined (BOOST_UBLAS_USE_SCALAR_ET)
+// FIXME don't define USE_SCALAR_ET other then for testing
+// They do not work for complex types
         typedef expression_type result_type;
 #else
         typedef typename F::result_type result_type;