diff options
| -rw-r--r-- | ACEXML/ChangeLog | 13 | ||||
| -rw-r--r-- | ACEXML/examples/SAXPrint/main.cpp | 6 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Parser.cpp | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog index 2f416dc4083..03fb42a12e9 100644 --- a/ACEXML/ChangeLog +++ b/ACEXML/ChangeLog @@ -1,3 +1,16 @@ +Fri Jan 30 16:04:43 2004 Krishnakumar B <kitty@cse.wustl.edu> + + * parser/parser/Parser.cpp: Rewrote a simple string manipulation + involving ACE_String_Base<char>::operator +() to use const char* + instead of char, so that we don't need an explicit template + instantiation for it. + + * examples/SAXPrint/main.cpp: Added missing explicit template + instantiations for ACE_Auto_Basic_Ptr. + + Thanks to Olli Savia <ops@iki.fi> for reporting problems with + explicit template instantiation on LynxOS. + Thu Jan 8 18:40:34 2004 Krishnakumar B <kitty@nospam.invalid.domain> diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index ad0e2e56c68..1fb07e43ddd 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -202,3 +202,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ACEXML_ENDTRY; return 0; } + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Auto_Basic_Ptr<ACEXML_DefaultHandler>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Auto_Basic_Ptr<ACEXML_DefaultHandler> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index ad4066ce522..54d0b19d1ad 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -2550,7 +2550,7 @@ ACEXML_Parser::parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) ACEXML_String str (entity); if (this->ref_state_ != ACEXML_ParserInt::IN_ENTITY_VALUE) { - const ACEXML_Char ch = '\x20'; + const ACEXML_Char* ch = "\x20"; str = ch + str + ch; } // ACE_DEBUG ((LM_DEBUG, |