From 7e54f5b80a38372c05aa9f19937a88ec5681b0ab Mon Sep 17 00:00:00 2001
From: Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
Date: Mon, 9 Jul 2001 12:21:56 +0000
Subject: [PATCH] valarray_meta.h (_Expr::operator+): Use qualified id for
 _Expr template template argument.

	* include/bits/valarray_meta.h (_Expr::operator+): Use qualified id
	for _Expr template template argument.
	(_Expr::operator-): Likewise.
	(_Expr::operator~): Likewise.
	(_Expr::operator!): Likewise.
	(_DEFINE_EXPR_UNARY_OPERATOR): Likewise.

From-SVN: r43862
---
 libstdc++-v3/ChangeLog                    |  9 +++++++++
 libstdc++-v3/include/bits/valarray_meta.h | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3ad6e0a647a..6fd9f64f86d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-09  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	* include/bits/valarray_meta.h (_Expr::operator+): Use qualified id
+	for _Expr template template argument.
+	(_Expr::operator-): Likewise.
+	(_Expr::operator~): Likewise.
+	(_Expr::operator!): Likewise.
+	(_DEFINE_EXPR_UNARY_OPERATOR): Likewise.
+
 2001-07-06  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
 
         * libmath/Makefile.am (EXTRA_DIST): Remove atan2f.c and expf.c
diff --git a/libstdc++-v3/include/bits/valarray_meta.h b/libstdc++-v3/include/bits/valarray_meta.h
index 392dc9b7eb0..002fe5f901b 100644
--- a/libstdc++-v3/include/bits/valarray_meta.h
+++ b/libstdc++-v3/include/bits/valarray_meta.h
@@ -655,16 +655,16 @@ namespace std
         valarray<value_type> operator[] (const valarray<bool>&) const;
         valarray<value_type> operator[] (const valarray<size_t>&) const;
     
-        _Expr<_UnClos<_Unary_plus,_Expr,_Clos>, value_type>
+        _Expr<_UnClos<_Unary_plus,std::_Expr,_Clos>, value_type>
         operator+ () const;
 
-        _Expr<_UnClos<negate,_Expr,_Clos>, value_type>
+        _Expr<_UnClos<negate,std::_Expr,_Clos>, value_type>
         operator- () const;
 
-        _Expr<_UnClos<_Bitwise_not,_Expr,_Clos>, value_type>
+        _Expr<_UnClos<_Bitwise_not,std::_Expr,_Clos>, value_type>
         operator~ () const;
 
-        _Expr<_UnClos<logical_not,_Expr,_Clos>, bool>
+        _Expr<_UnClos<logical_not,std::_Expr,_Clos>, bool>
         operator! () const;
 
         size_t size () const;
@@ -769,16 +769,16 @@ namespace std
     inline _Expr<_UnClos<logical_not,_Expr,_Dom>, bool>
     _Expr<_Dom,_Tp>::operator! () const
     {
-        typedef _UnClos<logical_not,_Expr,_Dom> _Closure;
+        typedef _UnClos<logical_not,std::_Expr,_Dom> _Closure;
         return _Expr<_Closure,_Tp> (_Closure(this->_M_closure));
     }
 
 #define _DEFINE_EXPR_UNARY_OPERATOR(_Op, _Name)                         \
 template<class _Dom, typename _Tp>                                      \
-inline _Expr<_UnClos<_Name,_Expr,_Dom>,_Tp>                             \
+inline _Expr<_UnClos<_Name,std::_Expr,_Dom>,_Tp>                        \
 _Expr<_Dom,_Tp>::operator _Op () const                                 \
 {                                                                       \
-    typedef _UnClos<_Name,_Expr,_Dom> _Closure;                         \
+    typedef _UnClos<_Name,std::_Expr,_Dom> _Closure;                    \
     return _Expr<_Closure,_Tp> (_Closure (this->_M_closure));           \
 }
 
-- 
2.30.2