diff options
| -rw-r--r-- | ACEXML/common/FileCharStream.cpp | 2 | ||||
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 13 | ||||
| -rw-r--r-- | ace/Argv_Type_Converter.h | 1 |
4 files changed, 26 insertions, 3 deletions
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index 1c1fe66e38d..943b8cddd1e 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -59,7 +59,7 @@ int ACEXML_FileCharStream::get (ACEXML_Char& ch) { ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_); - return (::feof(this->infile_) ? -1 : 0); + return (feof(this->infile_) ? -1 : 0); } int diff --git a/ChangeLog b/ChangeLog index 2727b8c984b..0ca70d966eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Sat Aug 24 16:41:36 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML\common\FileCharStream.cpp (get): + + Remove :: in front of the macro feof. VC is hopelessly confused. + + * ace/Argv_Type_Converter.h: + + Added #include "ace/OS_Memory.h" to get ACE_NEW. I needed to + touch this to test my changes. + Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS.h: #undef the atop macro so that it won't break the new @@ -9,7 +20,7 @@ Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> them without breaking earlier versions of LynxOS. Thanks to Umberto Mascia <u.mascia@pxl.it> for reporting this. - * docs/tutorials/015/Protocol_Stream.h (class Protocol_Stream): + * docs/tutorials/015/Protocol_Stream.h (class Protocol_Stream): Changed a comment to say "server-side applications" rather than "client-side applications." Thanks to Mark Xu <ltxd@371.net> for reporting this. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2727b8c984b..0ca70d966eb 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,14 @@ +Sat Aug 24 16:41:36 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML\common\FileCharStream.cpp (get): + + Remove :: in front of the macro feof. VC is hopelessly confused. + + * ace/Argv_Type_Converter.h: + + Added #include "ace/OS_Memory.h" to get ACE_NEW. I needed to + touch this to test my changes. + Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS.h: #undef the atop macro so that it won't break the new @@ -9,7 +20,7 @@ Sat Aug 24 12:01:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> them without breaking earlier versions of LynxOS. Thanks to Umberto Mascia <u.mascia@pxl.it> for reporting this. - * docs/tutorials/015/Protocol_Stream.h (class Protocol_Stream): + * docs/tutorials/015/Protocol_Stream.h (class Protocol_Stream): Changed a comment to say "server-side applications" rather than "client-side applications." Thanks to Mark Xu <ltxd@371.net> for reporting this. diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h index ed368d585c8..e606593e8bc 100644 --- a/ace/Argv_Type_Converter.h +++ b/ace/Argv_Type_Converter.h @@ -16,6 +16,7 @@ #include "ace/pre.h" #include "ace/ACE_export.h" +#include "ace/OS_Memory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |