diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-17 01:24:19 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-17 01:24:19 +0000 |
| commit | dafdeaa61878df2b5e1777d1bbf4997c49381b9f (patch) | |
| tree | 38dcc956764fc00d58368f71027089789d9fb5cd /ACEXML | |
| parent | a9de01cd3769dc0e2a98208297fa3675aa7bb77f (diff) | |
| download | ATCD-dafdeaa61878df2b5e1777d1bbf4997c49381b9f.tar.gz | |
ChangeLogTag: Wed Oct 16 20:23:09 2002 Krishnakumar B <kitty@cse.wustl.edu>
Diffstat (limited to 'ACEXML')
| -rw-r--r-- | ACEXML/common/FileCharStream.cpp | 6 | ||||
| -rw-r--r-- | ACEXML/common/FileCharStream.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index d319ba90e03..fa7e689529d 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -44,7 +44,7 @@ ACEXML_FileCharStream::determine_encoding (void) int retval = 0; int i = 0; for (; i < 4 && retval != -1; ++i) - retval = this->getchar(input[i]); + retval = this->getchar_i(input[i]); if (i < 4) return -1; const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); @@ -64,7 +64,7 @@ ACEXML_FileCharStream::determine_encoding (void) char ch; for (int j = 0; j < 2; ++j) { - this->getchar (ch); + this->getchar_i (ch); if (ch == '\xFF' || ch == '\xFE' || ch == '\xEF') continue; else @@ -105,7 +105,7 @@ ACEXML_FileCharStream::close (void) int -ACEXML_FileCharStream::getchar (char& ch) +ACEXML_FileCharStream::getchar_i (char& ch) { ch = ACE_OS::fgetc (this->infile_); return (feof(this->infile_) ? -1 : 0); diff --git a/ACEXML/common/FileCharStream.h b/ACEXML/common/FileCharStream.h index 79def212f48..d71792aac59 100644 --- a/ACEXML/common/FileCharStream.h +++ b/ACEXML/common/FileCharStream.h @@ -91,7 +91,7 @@ protected: /** Read the next character as a normal character. Return -1 if EOF is * reached, else return 0. */ - virtual int getchar (char& ch); + virtual int getchar_i (char& ch); private: |