stl_algo.h (transform): Rename __opr to __oper, as __opr is used internally by egcs.

* 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: r27557

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index f23f4fb1937b0562b72d7ffc19c3a8d72c093a47..f7b87de92c8ed6a14393f159960ae3a9255f37d6 100644 (file)
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-17  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>
+
 1999-05-17  Mark Kettenis  <kettenis@gnu.org>
 
        * stl_config.h: Only define __STL_PTHREADS with GLIBC >= 2 for

diff --git a/libstdc++/stl/stl_algo.h b/libstdc++/stl/stl_algo.h
index 57607ba5d49d3cf912b532f92f57e1cc30907574..e9beaee15f11a5d01f85bdef3032a01265dcb7f1 100644 (file)
--- 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;
 }