From c8d99a034c0433d663255476b39af4a7ed758f0d Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Thu, 22 Jul 1999 20:09:56 +0000 Subject: 990718, very close to release. testsuite temporarily removed from snapshots because of copyright checks. --- gnu/egcs/libstdc++/ChangeLog | 8 ++++++++ gnu/egcs/libstdc++/Makefile.in | 4 ++-- gnu/egcs/libstdc++/stl/ChangeLog | 6 ++++++ gnu/egcs/libstdc++/stl/stl_function.h | 8 ++++---- gnu/egcs/libstdc++/stl/stl_numeric.h | 14 +++++++------- 5 files changed, 27 insertions(+), 13 deletions(-) (limited to 'gnu/egcs/libstdc++') diff --git a/gnu/egcs/libstdc++/ChangeLog b/gnu/egcs/libstdc++/ChangeLog index a2c36d1eab8..22652d62609 100644 --- a/gnu/egcs/libstdc++/ChangeLog +++ b/gnu/egcs/libstdc++/ChangeLog @@ -1,3 +1,11 @@ +Sat Jul 17 23:49:59 1999 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (INTERFACE): Bump to 3. + +Fri Jul 9 01:20:23 1999 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (VERSION): Bump to 2.10.0. + Tue Jun 8 00:21:11 1999 Jeffrey A Law (law@cygnus.com) * configure.in (*-*-freebsd2*): Add missing '*' at end of configure diff --git a/gnu/egcs/libstdc++/Makefile.in b/gnu/egcs/libstdc++/Makefile.in index 6d2fcba662d..6b4b57d721d 100644 --- a/gnu/egcs/libstdc++/Makefile.in +++ b/gnu/egcs/libstdc++/Makefile.in @@ -14,8 +14,8 @@ # along with this library; see the file COPYING. If not, write to the Free # Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -VERSION = 2.9.0 -INTERFACE = 2 +VERSION = 2.10.0 +INTERFACE = 3 gxx_include_dir=${includedir}/g++ diff --git a/gnu/egcs/libstdc++/stl/ChangeLog b/gnu/egcs/libstdc++/stl/ChangeLog index 32bb031df8c..06bd7bce67a 100644 --- a/gnu/egcs/libstdc++/stl/ChangeLog +++ b/gnu/egcs/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 * stl_queue.h: Rename _M_c to c, and _M_comp to comp. diff --git a/gnu/egcs/libstdc++/stl/stl_function.h b/gnu/egcs/libstdc++/stl/stl_function.h index cd07c1c6730..a5a8486576e 100644 --- a/gnu/egcs/libstdc++/stl/stl_function.h +++ b/gnu/egcs/libstdc++/stl/stl_function.h @@ -202,10 +202,10 @@ public: template 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 @@ -227,10 +227,10 @@ public: template 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/gnu/egcs/libstdc++/stl/stl_numeric.h b/gnu/egcs/libstdc++/stl/stl_numeric.h index da7865498ca..392515a3d87 100644 --- a/gnu/egcs/libstdc++/stl/stl_numeric.h +++ b/gnu/egcs/libstdc++/stl/stl_numeric.h @@ -177,22 +177,22 @@ adjacent_difference(_InputIterator __first, _InputIterator __last, template -_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 -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 -- cgit v1.2.3