* stl_function.h (bind1st, bind2nd): Rename __opr to __oper,

        as __opr is used internally by egcs.
        * stl_numeric.h (__power, power): Likewise.

        * stl_algo.h (transform): Rename __opr to __oper, as __opr is used
        internally by egcs.
        Reported by Harri Porten <porten@tu-harburg.de>


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34949 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 25 insertions, 13 deletions

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index 1c617afe92f..d4b7cc78cae 100644
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,15 @@
+2000-07-10  Martin v. Löwis (loewis@informatik.hu-berlin.de)
+
+	* stl_function.h (bind1st, bind2nd): Rename __opr to __oper, 
+	as __opr is used internally by egcs.
+	* stl_numeric.h (__power, power): Likewise.
+
+2000-07-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
+	
+	* stl_algo.h (transform): Rename __opr to __oper, as __opr is used 
+	internally by egcs.
+	Reported by Harri Porten <porten@tu-harburg.de>
+	
 2000-01-19  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>
 
 	* stl_iterator.h: Make it possible to use standard class
diff --git a/libstdc++/stl/stl_algo.h b/libstdc++/stl/stl_algo.h
index 57607ba5d49..e9beaee15f1 100644
--- a/libstdc++/stl/stl_algo.h
+++ b/libstdc++/stl/stl_algo.h
@@ -446,9 +446,9 @@ _ForwardIter2 swap_ranges(_ForwardIter1 __first1, _ForwardIter1 __last1,
 
 template <class _InputIter, class _OutputIter, class _UnaryOperation>
 _OutputIter transform(_InputIter __first, _InputIter __last,
-                      _OutputIter __result, _UnaryOperation __opr) {
+                      _OutputIter __result, _UnaryOperation __oper) {
   for ( ; __first != __last; ++__first, ++__result)
-    *__result = __opr(*__first);
+    *__result = __oper(*__first);
   return __result;
 }
 
diff --git a/libstdc++/stl/stl_function.h b/libstdc++/stl/stl_function.h
index cd07c1c6730..a5a8486576e 100644
--- a/libstdc++/stl/stl_function.h
+++ b/libstdc++/stl/stl_function.h
@@ -202,10 +202,10 @@ public:
 
 template <class _Operation, class _Tp>
 inline binder1st<_Operation> 
-bind1st(const _Operation& __opr, const _Tp& __x) 
+bind1st(const _Operation& __oper, const _Tp& __x) 
 {
   typedef typename _Operation::first_argument_type _Arg1_type;
-  return binder1st<_Operation>(__opr, _Arg1_type(__x));
+  return binder1st<_Operation>(__oper, _Arg1_type(__x));
 }
 
 template <class _Operation> 
@@ -227,10 +227,10 @@ public:
 
 template <class _Operation, class _Tp>
 inline binder2nd<_Operation> 
-bind2nd(const _Operation& __opr, const _Tp& __x) 
+bind2nd(const _Operation& __oper, const _Tp& __x) 
 {
   typedef typename _Operation::second_argument_type _Arg2_type;
-  return binder2nd<_Operation>(__opr, _Arg2_type(__x));
+  return binder2nd<_Operation>(__oper, _Arg2_type(__x));
 }
 
 // unary_compose and binary_compose (extensions, not part of the standard).
diff --git a/libstdc++/stl/stl_numeric.h b/libstdc++/stl/stl_numeric.h
index da7865498ca..392515a3d87 100644
--- a/libstdc++/stl/stl_numeric.h
+++ b/libstdc++/stl/stl_numeric.h
@@ -177,22 +177,22 @@ adjacent_difference(_InputIterator __first, _InputIterator __last,
 
  
 template <class _Tp, class _Integer, class _MonoidOperation>
-_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __opr)
+_Tp __power(_Tp __x, _Integer __n, _MonoidOperation __oper)
 {
   if (__n == 0)
-    return identity_element(__opr);
+    return identity_element(__oper);
   else {
     while ((__n & 1) == 0) {
       __n >>= 1;
-      __x = __opr(__x, __x);
+      __x = __oper(__x, __x);
     }
 
     _Tp __result = __x;
     __n >>= 1;
     while (__n != 0) {
-      __x = __opr(__x, __x);
+      __x = __oper(__x, __x);
       if ((__n & 1) != 0)
-        __result = __opr(__result, __x);
+        __result = __oper(__result, __x);
       __n >>= 1;
     }
     return __result;
@@ -209,9 +209,9 @@ inline _Tp __power(_Tp __x, _Integer __n)
 // not part of the C++ standard.
 
 template <class _Tp, class _Integer, class _MonoidOperation>
-inline _Tp power(_Tp __x, _Integer __n, _MonoidOperation __opr)
+inline _Tp power(_Tp __x, _Integer __n, _MonoidOperation __oper)
 {
-  return __power(__x, __n, __opr);
+  return __power(__x, __n, __oper);
 }
 
 template <class _Tp, class _Integer>