stl_function.h (bind1st, bind2nd): Rename __opr to __oper, as __opr is used internall...

        * stl_function.h (bind1st, bind2nd): Rename __opr to __oper,
        as __opr is used internally by egcs.
        * stl_numeric.h (__power, power): Likewise.

From-SVN: r28059

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index 32bb031df8ce2aa5698f6b6039fae2c1255d7f48..06bd7bce67af2aa388bfe19479088b2cfec7d9f0 100644 (file)
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-11  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.
+
 1999-06-18  Martin von Löwis  <loewis@informatik.hu-berlin.de>
 
        * stl_queue.h: Rename _M_c to c, and _M_comp to comp.

diff --git a/libstdc++/stl/stl_function.h b/libstdc++/stl/stl_function.h
index cd07c1c673057ca91a27a3d43b65f01ed8938d3d..a5a8486576e9aedfd09a452b6084b8e4de2c3619 100644 (file)
--- 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 da7865498caedf111cab0401c2d661c192cd8b77..392515a3d87d7311aa4c58c66d4f9d081031d6f2 100644 (file)
--- 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>