diff options
| author | Olli Savia <ops@iki.fi> | 2007-06-03 20:05:12 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2007-06-03 20:05:12 +0000 |
| commit | 18d818d9fe4359fc6b5f7a26b1b3dcf55c4d9ff5 (patch) | |
| tree | 94eac918cc0bbd4a369bec1188877cb22b17c99c | |
| parent | ed28edc2f8af7ed8a41bd657813a7ac8609e5883 (diff) | |
| download | ATCD-18d818d9fe4359fc6b5f7a26b1b3dcf55c4d9ff5.tar.gz | |
ChangeLogTag: Sun Jun 3 20:02:32 UTC 2007 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ACEXML/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ACEXML/common/FileCharStream.cpp | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog index 4e76d780faa..aa8f29c9275 100644 --- a/ACE/ACEXML/ChangeLog +++ b/ACE/ACEXML/ChangeLog @@ -1,14 +1,19 @@ +Sun Jun 3 20:02:32 UTC 2007 Olli Savia <ops@iki.fi> + + * common/FileCharStream.cpp: + Replaced ungetc with ACE_OS::ungetc. + Fri May 18 02:50:42 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * common/Mem_Map_Stream.cpp: - It makes no sense to have code after a return statement + It makes no sense to have code after a return statement (such as ACE_ERROR_RETURN). It causes some builds to have "statement is unreachable" warning. * examples/SAXPrint/main.cpp: - Enhanced the "#ifndef" macros used to avoid "statement is + Enhanced the "#ifndef" macros used to avoid "statement is unreachable" warning. Tue May 15 17:36:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/ACEXML/common/FileCharStream.cpp b/ACE/ACEXML/common/FileCharStream.cpp index a7a3894f3cd..4420e00b99d 100644 --- a/ACE/ACEXML/common/FileCharStream.cpp +++ b/ACE/ACEXML/common/FileCharStream.cpp @@ -82,7 +82,7 @@ ACEXML_FileCharStream::determine_encoding (void) continue; else { - ungetc (ch, this->infile_); + ACE_OS::ungetc (ch, this->infile_); break; } } @@ -168,7 +168,7 @@ ACEXML_FileCharStream::peek (void) #else ACEXML_Char ch = static_cast<ACEXML_Char> (ACE_OS::fgetc (this->infile_)); - ::ungetc (ch, this->infile_); + ACE_OS::ungetc (ch, this->infile_); return ch; #endif /* ACE_USES_WCHAR */ } @@ -214,7 +214,7 @@ ACEXML_FileCharStream::peek_i (void) if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) { ACEXML_Char ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_); - ::ungetc (ch, this->infile_); + ACE_OS::ungetc (ch, this->infile_); return ch; } |