diff options
Diffstat (limited to 'contrib/libstdc++/std')
| -rw-r--r-- | contrib/libstdc++/std/bastring.cc | 10 | ||||
| -rw-r--r-- | contrib/libstdc++/std/bastring.h | 8 | ||||
| -rw-r--r-- | contrib/libstdc++/std/complext.cc | 2 | ||||
| -rw-r--r-- | contrib/libstdc++/std/valarray_array.h | 2 | ||||
| -rw-r--r-- | contrib/libstdc++/std/valarray_meta.h | 7 |
5 files changed, 14 insertions, 15 deletions
diff --git a/contrib/libstdc++/std/bastring.cc b/contrib/libstdc++/std/bastring.cc index f86f6d30157c6..3093b9e129d3e 100644 --- a/contrib/libstdc++/std/bastring.cc +++ b/contrib/libstdc++/std/bastring.cc @@ -1,5 +1,5 @@ // Member templates for the -*- C++ -*- string classes. -// Copyright (C) 1994, 1999 Free Software Foundation +// Copyright (C) 1994 Free Software Foundation // This file is part of the GNU ANSI C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -94,14 +94,14 @@ check_realloc (basic_string::size_type s) const template <class charT, class traits, class Allocator> void basic_string <charT, traits, Allocator>:: -alloc (basic_string::size_type __size, bool __save) +alloc (basic_string::size_type size, bool save) { - if (! check_realloc (__size)) + if (! check_realloc (size)) return; - Rep *p = Rep::create (__size); + Rep *p = Rep::create (size); - if (__save) + if (save) { p->copy (0, data (), length ()); p->len = length (); diff --git a/contrib/libstdc++/std/bastring.h b/contrib/libstdc++/std/bastring.h index cd3793fffc046..70891262e9650 100644 --- a/contrib/libstdc++/std/bastring.h +++ b/contrib/libstdc++/std/bastring.h @@ -1,5 +1,5 @@ // Main templates for the -*- C++ -*- string classes. -// Copyright (C) 1994, 1995, 1999 Free Software Foundation +// Copyright (C) 1994, 1995 Free Software Foundation // This file is part of the GNU ANSI C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -180,11 +180,11 @@ public: : dat (nilRep.grab ()) { assign (n, c); } #ifdef __STL_MEMBER_TEMPLATES template<class InputIterator> - basic_string(InputIterator __begin, InputIterator __end) + basic_string(InputIterator begin, InputIterator end) #else - basic_string(const_iterator __begin, const_iterator __end) + basic_string(const_iterator begin, const_iterator end) #endif - : dat (nilRep.grab ()) { assign (__begin, __end); } + : dat (nilRep.grab ()) { assign (begin, end); } ~basic_string () { rep ()->release (); } diff --git a/contrib/libstdc++/std/complext.cc b/contrib/libstdc++/std/complext.cc index 60227f213299e..d50bf0871f611 100644 --- a/contrib/libstdc++/std/complext.cc +++ b/contrib/libstdc++/std/complext.cc @@ -236,7 +236,7 @@ pow (const complex<FLOAT>& xin, int y) if (y < 0) { y = -y; - x = FLOAT(1)/x; + x = 1/x; } for (;;) { diff --git a/contrib/libstdc++/std/valarray_array.h b/contrib/libstdc++/std/valarray_array.h index a0b5818fd8b06..f711e52a1650e 100644 --- a/contrib/libstdc++/std/valarray_array.h +++ b/contrib/libstdc++/std/valarray_array.h @@ -73,7 +73,7 @@ template<typename _Tp> inline void __valarray_copy (const _Tp* __restrict__ __a, size_t __n, size_t __s, _Tp* __restrict__ __b) -{ for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b = *__a; } +{ for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b += *__a; } // copy plain __a[<__n>] in strided __b[<__n : __s>] template<typename _Tp> diff --git a/contrib/libstdc++/std/valarray_meta.h b/contrib/libstdc++/std/valarray_meta.h index 48fb21371f770..f799111c7bcc1 100644 --- a/contrib/libstdc++/std/valarray_meta.h +++ b/contrib/libstdc++/std/valarray_meta.h @@ -449,7 +449,7 @@ struct _BinClos<_Oper,_ValArray,_Expr,typename _Dom::value_type,_Dom> typedef _BinBase<_Oper,valarray<_Tp>,_Dom> _Base; typedef typename _Base::value_type value_type; - _BinClos (const valarray<_Tp>& __e1, const _Dom& __e2) + _BinClos (const valarray<_Tp> __e1, const _Dom& __e2) : _Base (__e1, __e2) {} }; @@ -917,7 +917,7 @@ _Name(const _Expr<_Dom,typename _Dom::value_type>& __e) \ { \ typedef typename _Dom::value_type _Tp; \ typedef _UnFunClos<_Expr,_Dom> _Closure; \ - return _Expr<_Closure,_Tp>(_Closure(__e(), (_Tp(*)(_Tp))(&_Name))); \ + return _Expr<_Closure,_Tp> (_Closure (__e, (_Tp(*)(_Tp))(&_Name))); \ } \ \ template<typename _Tp> \ @@ -936,8 +936,7 @@ _Name(const valarray<_Tp>& __v) \ _DEFINE_EXPR_UNARY_FUNCTION(sin) _DEFINE_EXPR_UNARY_FUNCTION(asin) _DEFINE_EXPR_UNARY_FUNCTION(sinh) - _DEFINE_EXPR_UNARY_FUNCTION(tan) - _DEFINE_EXPR_UNARY_FUNCTION(tanh) + _DEFINE_EXPR_UNARY_FUNCTION(tan) _DEFINE_EXPR_UNARY_FUNCTION(atan) _DEFINE_EXPR_UNARY_FUNCTION(exp) _DEFINE_EXPR_UNARY_FUNCTION(log) |