diff options
| -rw-r--r-- | ACEXML/common/HttpCharStream.cpp | 2 | ||||
| -rw-r--r-- | ACEXML/common/Mem_Map_Stream.cpp | 8 | ||||
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 12 |
5 files changed, 45 insertions, 1 deletions
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp index 0c8b99af5ce..02d5826e30c 100644 --- a/ACEXML/common/HttpCharStream.cpp +++ b/ACEXML/common/HttpCharStream.cpp @@ -283,5 +283,5 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str, int ACEXML_HttpCharStream::peek (void) { - return this->stream_->peek_char (1); + return this->stream_->peek_char (0); } diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp index 36ef4dfd940..1399648d0c9 100644 --- a/ACEXML/common/Mem_Map_Stream.cpp +++ b/ACEXML/common/Mem_Map_Stream.cpp @@ -243,3 +243,11 @@ ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void) // Remove the mapping and the file. this->mem_map_.remove (); } + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; +template class ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> +#pragma instantiate ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ChangeLog b/ChangeLog index e4d738d3457..f5e4b092819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Wed Jun 5 16:58:41 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML/common/Mem_Map_Stream.cpp: + + Instantiate the templates needed when explicit templates are + defined. Thanks to Carlos for pointing this out. + + * ACEXML/common/HttpCharStream.cpp: + + Peek means "get the next character", not "get the character + after next". The previous change to the test caught this bug. + Wed Jun 5 16:42:43 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/examples/SAXPrint/main.cpp (ACE_TMAIN): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index e4d738d3457..f5e4b092819 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Wed Jun 5 16:58:41 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML/common/Mem_Map_Stream.cpp: + + Instantiate the templates needed when explicit templates are + defined. Thanks to Carlos for pointing this out. + + * ACEXML/common/HttpCharStream.cpp: + + Peek means "get the next character", not "get the character + after next". The previous change to the test caught this bug. + Wed Jun 5 16:42:43 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/examples/SAXPrint/main.cpp (ACE_TMAIN): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index e4d738d3457..f5e4b092819 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Wed Jun 5 16:58:41 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML/common/Mem_Map_Stream.cpp: + + Instantiate the templates needed when explicit templates are + defined. Thanks to Carlos for pointing this out. + + * ACEXML/common/HttpCharStream.cpp: + + Peek means "get the next character", not "get the character + after next". The previous change to the test caught this bug. + Wed Jun 5 16:42:43 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/examples/SAXPrint/main.cpp (ACE_TMAIN): |