diff options
author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-23 21:41:49 +0000 |
---|---|---|
committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-23 21:41:49 +0000 |
commit | 644fbf705f73dcaa906047465a6bf4763a18f44b (patch) | |
tree | 2c7c4fa5dfa9ea60b3ae031ef15b7a4e46fbbb70 | |
parent | f186f76d3b126f97214435cd5e6c4fbf085cbd01 (diff) | |
download | ATCD-644fbf705f73dcaa906047465a6bf4763a18f44b.tar.gz |
ChangeLogTag: Fri Aug 23 16:25:47 2002 Krishnakumar B <kitty@cs.wustl.edu>
-rw-r--r-- | ACEXML/common/FileCharStream.cpp | 4 | ||||
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 14 | ||||
-rw-r--r-- | ace/OS.h | 15 | ||||
-rw-r--r-- | ace/OS.i | 19 |
5 files changed, 30 insertions, 36 deletions
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index 1f66991c884..1c1fe66e38d 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -59,7 +59,7 @@ int ACEXML_FileCharStream::get (ACEXML_Char& ch) { ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_); - return (ACE_OS::feof(this->infile_) ? -1 : 0); + return (::feof(this->infile_) ? -1 : 0); } int @@ -73,6 +73,6 @@ int ACEXML_FileCharStream::peek (void) { ACEXML_Char ch = ACE_OS::fgetc (this->infile_); - ACE_OS::ungetc (ch, this->infile_); + ::ungetc (ch, this->infile_); return ch; } diff --git a/ChangeLog b/ChangeLog index efe97843a3d..99c32ab2001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Fri Aug 23 16:25:47 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/OS.i: + * ace/OS.h: + + Removed the wrappers for functions that are known to be + overloaded by macros. #undef will break user code for these + functions. This includes feof(), ferror() and ungetc(). The + other functions seem to only have a function implementation. + + * ACEXML/common/FileCharStream.cpp: + + Removed the use of ACE_OS wrappers for the above functions. + Fri Aug 23 08:40:38 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/config-qnx-rtp.h: Added some new #defines so ACE will diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index efe97843a3d..99c32ab2001 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,17 @@ +Fri Aug 23 16:25:47 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/OS.i: + * ace/OS.h: + + Removed the wrappers for functions that are known to be + overloaded by macros. #undef will break user code for these + functions. This includes feof(), ferror() and ungetc(). The + other functions seem to only have a function implementation. + + * ACEXML/common/FileCharStream.cpp: + + Removed the use of ACE_OS wrappers for the above functions. + Fri Aug 23 08:40:38 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/config-qnx-rtp.h: Added some new #defines so ACE will @@ -4700,24 +4700,9 @@ public: size_t nelems, FILE *fp); -#if defined (feof) -#undef feof -#endif /* feof */ - static int feof (FILE *fp); - -#if defined (ferror) -#undef ferror -#endif /* ferror */ - static int ferror (FILE *fp); - static int fgetc (FILE* fp); static void clearerr (FILE* fp); -#if defined (ungetc) -#undef ungetc -#endif /* ungetc */ - static int ungetc (int c, FILE* fp); - #if defined (ACE_HAS_WCHAR) static wint_t fgetwc (FILE* fp); static wint_t ungetwc (wint_t c, FILE* fp); @@ -9748,18 +9748,6 @@ ACE_OS::fsetpos (FILE* fp, fpos_t* pos) } ACE_INLINE int -ACE_OS::feof (FILE* fp) -{ - ACE_OSCALL_RETURN (::feof (fp), int, -1); -} - -ACE_INLINE int -ACE_OS::ferror (FILE* fp) -{ - ACE_OSCALL_RETURN (::ferror (fp), int, -1); -} - -ACE_INLINE int ACE_OS::fgetc (FILE* fp) { ACE_OSCALL_RETURN (::fgetc (fp), int, -1); @@ -9771,13 +9759,6 @@ ACE_OS::clearerr (FILE* fp) ::clearerr(fp); } -ACE_INLINE int -ACE_OS::ungetc (int c, FILE* fp) -{ - ACE_OSCALL_RETURN (::ungetc (c, fp), int, -1); -} - - #if defined (ACE_HAS_WCHAR) ACE_INLINE wint_t |