diff options
| author | loewis <loewis@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-12-15 07:46:36 +0000 |
|---|---|---|
| committer | loewis <loewis@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-12-15 07:46:36 +0000 |
| commit | 87ac605e9185c66aea8d32506e65baeb9c26e82a (patch) | |
| tree | bdd64844f1ecff1d4314a30090d9f6dd8b0747b3 /libio | |
| parent | 8cc494fc0a9eeb5d4942bf2a242391cc905af5ab (diff) | |
| download | ppe42-gcc-87ac605e9185c66aea8d32506e65baeb9c26e82a.tar.gz ppe42-gcc-87ac605e9185c66aea8d32506e65baeb9c26e82a.zip | |
* strstream.h (strstreambuf::streambuf): Rename parameters to
avoid shadow warning.
* stream.h (WS): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30941 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/ChangeLog | 6 | ||||
| -rw-r--r-- | libio/stream.h | 4 | ||||
| -rw-r--r-- | libio/strstream.h | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index fcdb29773e2..ce4d1335717 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,9 @@ +1999-12-14 Martin v. Löwis <loewis@informatik.hu-berlin.de> + + * strstream.h (strstreambuf::streambuf): Rename parameters to + avoid shadow warning. + * stream.h (WS): Likewise. + Thu Sep 30 01:08:04 1999 Jeffrey A Law (law@cygnus.com) * editbuf.cc, parsestream.cc, pfstream.cc: Include string.h. diff --git a/libio/stream.h b/libio/stream.h index 0859802ade6..90f8c1f2781 100644 --- a/libio/stream.h +++ b/libio/stream.h @@ -1,5 +1,5 @@ /* -Copyright (C) 1993 Free Software Foundation +Copyright (C) 1993, 1999 Free Software Foundation This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or modify it under the @@ -53,7 +53,7 @@ extern char* oct(unsigned int, int=0); char* chr(char ch, int width = 0); char* str(const char* s, int width = 0); -inline istream& WS(istream& str) { return ws(str); } +inline istream& WS(istream& __str) { return ws(__str); } } // extern "C++" #endif /* !_COMPAT_STREAM_H */ diff --git a/libio/strstream.h b/libio/strstream.h index d549b454758..967e5b0b76a 100644 --- a/libio/strstream.h +++ b/libio/strstream.h @@ -1,5 +1,5 @@ /* This is part of libio/iostream, providing -*- C++ -*- input/output. -Copyright (C) 1993 Free Software Foundation +Copyright (C) 1993, 1999 Free Software Foundation This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or modify it under the @@ -50,8 +50,8 @@ class strstreambuf : public streambuf virtual ~strstreambuf(); strstreambuf() { init_dynamic(0, 0); } strstreambuf(int initial_size) { init_dynamic(0, 0, initial_size); } - strstreambuf(void *(*alloc)(_IO_size_t), void (*free)(void*)) - { init_dynamic(alloc, free); } + strstreambuf(void *(*__alloc)(_IO_size_t), void (*__free)(void*)) + { init_dynamic(__alloc, __free); } strstreambuf(char *ptr, int size, char *pstart = NULL) { init_static(ptr, size, pstart); } strstreambuf(unsigned char *ptr, int size, unsigned char *pstart = NULL) |
