aboutsummaryrefslogtreecommitdiff
path: root/libstdc++/stl/stl_algo.h
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2000-07-10 17:04:22 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-07-10 17:04:22 -0400
commitad66df7aa0d0d71c20d634b92b1c0e4c04640351 (patch)
tree386519f804555e6f31db81b0d458e6d3b39ab52e /libstdc++/stl/stl_algo.h
parentec039e3c262cc8f899997f2b7631031c39c96e3e (diff)
downloadgcc-ad66df7aa0d0d71c20d634b92b1c0e4c04640351.zip
gcc-ad66df7aa0d0d71c20d634b92b1c0e4c04640351.tar.gz
gcc-ad66df7aa0d0d71c20d634b92b1c0e4c04640351.tar.bz2
stl_function.h (bind1st, bind2nd): Rename __opr to __oper, as __opr is used internally by egcs.
* 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> From-SVN: r34949
Diffstat (limited to 'libstdc++/stl/stl_algo.h')
-rw-r--r--libstdc++/stl/stl_algo.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++/stl/stl_algo.h b/libstdc++/stl/stl_algo.h
index 57607ba..e9beaee 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;
}