diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-09 06:19:23 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-09 06:19:23 +0000 |
| commit | d0e27e0947271fc81238f3ac68ec541eaf1e8d4d (patch) | |
| tree | 7e3e90bd06ca9b4fe84d5fab61a1583fd56aa244 | |
| parent | 6cf7844f97156c4e28c0bdcf531359ec47a8a72c (diff) | |
| download | ATCD-d0e27e0947271fc81238f3ac68ec541eaf1e8d4d.tar.gz | |
ChangeLogTag:Thu May 9 01:07:56 2002 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ACEXML/common/StrCharStream.cpp | 4 | ||||
| -rw-r--r-- | ACEXML/common/StrCharStream.h | 2 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 |
5 files changed, 21 insertions, 3 deletions
diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp index 55e5b93f201..c185df0a070 100644 --- a/ACEXML/common/StrCharStream.cpp +++ b/ACEXML/common/StrCharStream.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/StrCharStream.h" +#include "ACEXML/common/StrCharStream.h" #include "ace/ACE.h" ACEXML_StrCharStream::ACEXML_StrCharStream (void) @@ -77,7 +77,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, if (this->start_ != 0 && this->ptr_ != this->end_) { - if (len > this->end_ - this->ptr_) + if ((int) len > this->end_ - this->ptr_) len = this->end_ - this->ptr_; ACE_OS_String::strncpy (str, this->ptr_, len); diff --git a/ACEXML/common/StrCharStream.h b/ACEXML/common/StrCharStream.h index 17f8e33d914..b1817ad0366 100644 --- a/ACEXML/common/StrCharStream.h +++ b/ACEXML/common/StrCharStream.h @@ -13,7 +13,7 @@ #ifndef _ACEXML_STRCHARSTREAM_H_ #define _ACEXML_STRCHARSTREAM_H_ -#include "common/CharStream.h" +#include "ACEXML/common/CharStream.h" /** * @class ACEXML_StrCharStream StrCharStream.h "common/StrCharStream.h" diff --git a/ChangeLog b/ChangeLog index 4bb21415806..be32e444291 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu May 9 01:07:56 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/common/StrCharStream.h: + * ACEXML/common/StrCharStream.cpp: Fixed Linux compilation + errors. + Thu May 09 00:38:22 2002 Irfan Pyarali <irfan@cs.wustl.edu> * ace/WFMO_Reactor.cpp (event_handling): Added a fix for bug diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 4bb21415806..be32e444291 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Thu May 9 01:07:56 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/common/StrCharStream.h: + * ACEXML/common/StrCharStream.cpp: Fixed Linux compilation + errors. + Thu May 09 00:38:22 2002 Irfan Pyarali <irfan@cs.wustl.edu> * ace/WFMO_Reactor.cpp (event_handling): Added a fix for bug diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 4bb21415806..be32e444291 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Thu May 9 01:07:56 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/common/StrCharStream.h: + * ACEXML/common/StrCharStream.cpp: Fixed Linux compilation + errors. + Thu May 09 00:38:22 2002 Irfan Pyarali <irfan@cs.wustl.edu> * ace/WFMO_Reactor.cpp (event_handling): Added a fix for bug |