diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-03 20:01:49 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-03 20:01:49 +0000 |
| commit | 8b9998e53682c6815f62206ea256a7226103de3f (patch) | |
| tree | 47ffa30bec7d2fbb7f66bbd26f76cd82fae768d4 | |
| parent | 142826e23e6c5b2b273b3911bbf15f6f49a3ec47 (diff) | |
| download | ATCD-8b9998e53682c6815f62206ea256a7226103de3f.tar.gz | |
ChangeLogTag: Sat Aug 3 14:56:23 2002 Krishnakumar B <kitty@cs.wustl.edu>
| -rw-r--r-- | ACEXML/common/HttpCharStream.cpp | 3 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Parser.cpp | 5 | ||||
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 12 |
4 files changed, 27 insertions, 5 deletions
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp index 9abe58fcc5a..9377fc5c4e0 100644 --- a/ACEXML/common/HttpCharStream.cpp +++ b/ACEXML/common/HttpCharStream.cpp @@ -275,7 +275,8 @@ int ACEXML_HttpCharStream::read (ACEXML_Char *str, size_t len) { - str = ACE_const_cast (ACEXML_Char*, this->stream_->recv (len)); + char* temp = ACE_const_cast (char*, this->stream_->recv (len)); + str = ACE_TEXT_CHAR_TO_TCHAR (temp); if (str == 0) return -1; return len; diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index c968f91a4af..0265841c155 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -784,10 +784,7 @@ ACEXML_Parser::parse_element (int is_root, ACEXML_Env &xmlenv) } } } - // Cleanup the prefix and name -// delete[] prefix; -// delete[] name; - return; + ACE_NOTREACHED (return;) } int diff --git a/ChangeLog b/ChangeLog index a96a0768bbc..49d8f18b3d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat Aug 3 14:56:23 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML/common/HttpCharStream.cpp: + + Fixed a conversion error from char to wchar_t. Thanks to Johnny + for pointing this out. + + * ACEXML/parser/parser/Parser.cpp: + + Fixed an unreachable statement warning. Thanks to Bala for + pointing this out. + Sat Aug 3 19:53:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ACEXML/common/XML_Codecs.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a96a0768bbc..49d8f18b3d0 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Sat Aug 3 14:56:23 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML/common/HttpCharStream.cpp: + + Fixed a conversion error from char to wchar_t. Thanks to Johnny + for pointing this out. + + * ACEXML/parser/parser/Parser.cpp: + + Fixed an unreachable statement warning. Thanks to Bala for + pointing this out. + Sat Aug 3 19:53:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ACEXML/common/XML_Codecs.h: |