diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-10-20 16:40:08 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-10-20 16:40:08 +0000 |
| commit | f09b8e5f72537f92688e25909af376bfd2ed7e58 (patch) | |
| tree | 45c0b3b3b55522258760a847b5e66089ff29be06 | |
| parent | efdb7e6910129a05812896c4d700780baa994552 (diff) | |
| download | ATCD-f09b8e5f72537f92688e25909af376bfd2ed7e58.tar.gz | |
ChangeLogTag:Sun Oct 20 11:36:34 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | ACEXML/common/FileCharStream.cpp | 6 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index fa7e689529d..7eda451917f 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -149,7 +149,8 @@ ACEXML_FileCharStream::get_i (ACEXML_Char& ch) int BE = (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; ACEXML_Char input[2]; - for (int i = 0; i < 2 && !feof (this->infile_); ++i) + int i = 0; + for (i = 0; i < 2 && !feof (this->infile_); ++i) { input[i] = ACE_OS::fgetwc (this->infile_); } @@ -197,7 +198,8 @@ ACEXML_FileCharStream::peek_i (void) int BE = (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; ACEXML_Char input[2]; - for (int i = 0; i < 2 && !feof (this->infile_); ++i) + int i = 0; + for (i = 0; i < 2 && !feof (this->infile_); ++i) { input[i] = ACE_OS::fgetwc (this->infile_); } diff --git a/ChangeLog b/ChangeLog index c176226090e..d85494f709b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 20 11:36:34 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * ACEXML/common/FileCharStream.cpp: Fixed a compile error in + Borland builds. The compile error is due to strict enforcement + of scoping rules in a for loop by Borland compiler. + Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c176226090e..d85494f709b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sun Oct 20 11:36:34 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * ACEXML/common/FileCharStream.cpp: Fixed a compile error in + Borland builds. The compile error is due to strict enforcement + of scoping rules in a for loop by Borland compiler. + Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of |