valarray_array.h (_DEFINE_ARRAY_FUNCTION): Use our object function surrogates.

	* include/bits/valarray_array.h (_DEFINE_ARRAY_FUNCTION): Use our
	object function surrogates.
	* include/bits/valarray_meta.h (__shift_left): Fix typo.
	(_BinFunClos<>): Remove.
	(_BinFunBase<>): Likewise.
	(_BinFunBase1<>):Likewise.
	(_BinFunBase2<>): Likewise.
	(_DEFINE_EXPR_RELATIONAL_OPERATOR): Likewise.
	(_DEFINE_EXPR_UNARY_OPERATOR): Adjust definition.
	(_DEFINE_EXPR_BINARY_OPERATOR): Likewise.
	(_DEFINE_EXPR_BINARY_FUNCTION): Likewise.
	* include/std/std_valarray.h: Dont #include <functional> anymore.
	(_Bitwise_or<>, _Bitwise_and<>, _Bitwise_xor<>, _Shift_left<>,
	_Shift_right<>): Remove.
	(_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT): Adjust instantiation.
	(_DEFINE_BINARY_OPERATOR): Tweak definition.
	(_DEFINE_LOGICAL_OPERATOR): Remove.
	* testsuite/26_numerics/valarray_name_lookup.C (main): Add more tests.

From-SVN: r56001

libstdc++-v3/ChangeLog

+2002-08-03  Gabriel Dos Reis  <gdr@nerim.net>
+
+	* include/bits/valarray_array.h (_DEFINE_ARRAY_FUNCTION): Use our
+	object function surrogates.
+	* include/bits/valarray_meta.h (__shift_left): Fix typo.
+	(_BinFunClos<>): Remove.
+	(_BinFunBase<>): Likewise.
+	(_BinFunBase1<>):Likewise.
+	(_BinFunBase2<>): Likewise.
+	(_DEFINE_EXPR_RELATIONAL_OPERATOR): Likewise.
+	(_DEFINE_EXPR_UNARY_OPERATOR): Adjust definition.
+	(_DEFINE_EXPR_BINARY_OPERATOR): Likewise.
+	(_DEFINE_EXPR_BINARY_FUNCTION): Likewise.
+	* include/std/std_valarray.h: Dont #include <functional> anymore.
+	(_Bitwise_or<>, _Bitwise_and<>, _Bitwise_xor<>, _Shift_left<>,
+	_Shift_right<>): Remove.
+	(_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT): Adjust instantiation.
+	(_DEFINE_BINARY_OPERATOR): Tweak definition.
+	(_DEFINE_LOGICAL_OPERATOR): Remove.
+	* testsuite/26_numerics/valarray_name_lookup.C (main): Add more tests.
+
 2002-08-02  Gabriel Dos Reis  <gdr@nerim.net>
 
 	* include/bits/valarray_meta.h (_UnFunBase<>): Remove.

libstdc++-v3/include/bits/valarray_array.h

@@ -603,16 +603,16 @@ _Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m,		\
     }									\
 }
 
-   _DEFINE_ARRAY_FUNCTION(+, plus)
-   _DEFINE_ARRAY_FUNCTION(-, minus)
-   _DEFINE_ARRAY_FUNCTION(*, multiplies)
-   _DEFINE_ARRAY_FUNCTION(/, divides)
-   _DEFINE_ARRAY_FUNCTION(%, modulus)
-   _DEFINE_ARRAY_FUNCTION(^, xor)
-   _DEFINE_ARRAY_FUNCTION(|, or)
-   _DEFINE_ARRAY_FUNCTION(&, and)    
-   _DEFINE_ARRAY_FUNCTION(<<, shift_left)
-   _DEFINE_ARRAY_FUNCTION(>>, shift_right)
+   _DEFINE_ARRAY_FUNCTION(+, __plus)
+   _DEFINE_ARRAY_FUNCTION(-, __minus)
+   _DEFINE_ARRAY_FUNCTION(*, __multiplies)
+   _DEFINE_ARRAY_FUNCTION(/, __divides)
+   _DEFINE_ARRAY_FUNCTION(%, __modulus)
+   _DEFINE_ARRAY_FUNCTION(^, __bitwise_xor)
+   _DEFINE_ARRAY_FUNCTION(|, __bitwise_or)
+   _DEFINE_ARRAY_FUNCTION(&, __bitwise_and)    
+   _DEFINE_ARRAY_FUNCTION(<<, __shift_left)
+   _DEFINE_ARRAY_FUNCTION(>>, __shift_right)
 
 #undef _DEFINE_VALARRAY_FUNCTION    
 

libstdc++-v3/testsuite/26_numerics/valarray_name_lookup.C

@@ -116,4 +116,27 @@ int main()
   v = log(u);
   v = log10(u);
   v = sqrt(u);  
+
+  Array w = u + v;
+  w = u - v;
+  w = u * v;
+  w = u / v;
+  w = u % v;
+
+  w = u ^ v;
+  w = u & v;
+  w = u | v;
+
+  w = u << v;
+  w = u >> v;
+
+  z = u == v;
+  z = u != v;
+  z = u < v;
+  z = u <= v;
+  z = u > v;
+  z = u >= v;
+
+  w = atan2(u, v);
+  w = pow(u, v);
 }