diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-07-16 10:22:58 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-07-16 10:22:58 +0000 |
| commit | b0f045965e1f3ef2ee0e3a42a0702cbd4bb86913 (patch) | |
| tree | 5b70c3677f059817e7635351e05046b6d4f57815 /ACE | |
| parent | b4dfa65257d49ad1da7e95bb4e95ffc883d72193 (diff) | |
| download | ATCD-b0f045965e1f3ef2ee0e3a42a0702cbd4bb86913.tar.gz | |
Mon Jul 16 10:19:51 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'ACE')
26 files changed, 144 insertions, 406 deletions
diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog index aa8f29c9275..6e99331c13c 100644 --- a/ACE/ACEXML/ChangeLog +++ b/ACE/ACEXML/ChangeLog @@ -1,3 +1,33 @@ +Mon Jul 16 10:19:51 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * apps/svcconf/Svcconf_Handler.h: + * apps/svcconf/Svcconf_Handler.cpp: + * common/Attributes_Def_Builder.h: + * common/ContentHandler.h: + * common/DTDHandler.h: + * common/DefaultHandler.h: + * common/DefaultHandler.cpp: + * common/Element_Def_Builder.h: + * common/EntityResolver.h: + * common/ErrorHandler.h: + * common/Validator.h: + * common/XMLFilterImpl.h: + * common/XMLFilterImpl.cpp: + * common/XMLReader.h: + * examples/SAXPrint/Print_Handler.h: + * examples/SAXPrint/Print_Handler.cpp: + * examples/SAXPrint/SAXPrint_Handler.h: + * examples/SAXPrint/SAXPrint_Handler.cpp: + * parser/debug_validator/Debug_Attributes_Builder.h: + * parser/debug_validator/Debug_Attributes_Builder.cpp: + * parser/debug_validator/Debug_Element_Builder.h: + * parser/debug_validator/Debug_Element_Builder.cpp: + * parser/parser/Parser.h: + * parser/parser/Parser.cpp: + * tests/ContentHandler_Test.cpp: + + Fixed Fuzz warnings. Zap the usage of exception specification. + Sun Jun 3 20:02:32 UTC 2007 Olli Savia <ops@iki.fi> * common/FileCharStream.cpp: diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp index 3a02583759f..c78b5686561 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp +++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp @@ -37,14 +37,12 @@ void ACEXML_Svcconf_Handler::characters (const ACEXML_Char *, int, int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } void ACEXML_Svcconf_Handler::endDocument ( ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } @@ -53,7 +51,6 @@ void ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (ACE_OS::strcmp (qName, ACE_TEXT ("dynamic")) == 0) { @@ -272,7 +269,6 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, void ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } @@ -281,7 +277,6 @@ void ACEXML_Svcconf_Handler::ignorableWhitespace (const ACEXML_Char *, int, int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } @@ -289,7 +284,6 @@ ACEXML_Svcconf_Handler::ignorableWhitespace (const ACEXML_Char *, void ACEXML_Svcconf_Handler::processingInstruction (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } @@ -302,14 +296,12 @@ ACEXML_Svcconf_Handler::setDocumentLocator (ACEXML_Locator* locator) void ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } void ACEXML_Svcconf_Handler::startDocument ( ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // no-op } @@ -319,7 +311,6 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName, ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (ACE_OS::strcmp (qName, ACE_TEXT ("dynamic")) == 0) { @@ -505,7 +496,6 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, void ACEXML_Svcconf_Handler::startPrefixMapping (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -516,7 +506,6 @@ void ACEXML_Svcconf_Handler::notationDecl (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -526,7 +515,6 @@ ACEXML_Svcconf_Handler::unparsedEntityDecl (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -536,7 +524,6 @@ ACEXML_Svcconf_Handler::unparsedEntityDecl (const ACEXML_Char *, ACEXML_InputSource * ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. return 0; @@ -549,7 +536,6 @@ ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *, */ void ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(), this->locator_->getLineNumber(), @@ -559,7 +545,6 @@ ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_ void ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(), this->locator_->getLineNumber(), @@ -569,7 +554,6 @@ ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_ void ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(), this->locator_->getLineNumber(), diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h index 87ae16b1e46..b15e20d7426 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h +++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h @@ -103,14 +103,12 @@ public: virtual void characters (const ACEXML_Char *ch, int start, int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of the end of a document. */ virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -119,14 +117,12 @@ public: virtual void endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * End the scope of a prefix-URI mapping. */ virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -135,7 +131,6 @@ public: virtual void ignorableWhitespace (const ACEXML_Char *ch, int start, int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -143,7 +138,6 @@ public: */ virtual void processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -155,14 +149,12 @@ public: * Receive notification of a skipped entity. */ virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of the beginning of a document. */ virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -172,7 +164,6 @@ public: const ACEXML_Char *localName, const ACEXML_Char *qName, ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -180,7 +171,6 @@ public: */ virtual void startPrefixMapping (const ACEXML_Char *prefix, const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // *** Methods inherit from ACEXML_DTDHandler. @@ -191,7 +181,6 @@ public: virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -201,7 +190,6 @@ public: const ACEXML_Char *publicId, const ACEXML_Char *systemId, const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // Methods inherit from ACEXML_EnitityResolver. @@ -211,7 +199,6 @@ public: */ virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // Methods inherit from ACEXML_ErrorHandler. @@ -220,21 +207,18 @@ public: * Receive notification of a recoverable error. */ virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of a non-recoverable error. */ virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of a warning. */ virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; protected: diff --git a/ACE/ACEXML/common/Attributes_Def_Builder.h b/ACE/ACEXML/common/Attributes_Def_Builder.h index c0b5c144208..c91025cd33d 100644 --- a/ACE/ACEXML/common/Attributes_Def_Builder.h +++ b/ACE/ACEXML/common/Attributes_Def_Builder.h @@ -76,20 +76,20 @@ public: * Set the attribute type. */ virtual int setAttType (const ATT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Insert an element for NOTATION or ENUMERATION type attribute. */ virtual int insertList (const ACEXML_Char *Name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Set default attribute declaration. */ virtual int setDefault (const DEFAULT_DECL def, const ACEXML_Char *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Check validity of the current attribute definition being built. @@ -129,7 +129,7 @@ public: virtual int setElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Acquire an Attribute_Builder. diff --git a/ACE/ACEXML/common/ContentHandler.h b/ACE/ACEXML/common/ContentHandler.h index af8024dff5f..006eb4ded37 100644 --- a/ACE/ACEXML/common/ContentHandler.h +++ b/ACE/ACEXML/common/ContentHandler.h @@ -55,13 +55,13 @@ public: size_t start, size_t length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of the end of a document. */ virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of the end of an element. @@ -69,13 +69,13 @@ public: virtual void endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * End the scope of a prefix-URI mapping. */ virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of ignorable whitespace in element content. @@ -83,14 +83,14 @@ public: virtual void ignorableWhitespace (const ACEXML_Char *ch, int start, int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of a processing instruction. */ virtual void processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive an object for locating the origin of SAX document events. @@ -101,13 +101,13 @@ public: * Receive notification of a skipped entity. */ virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of the beginning of a document. */ virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of the beginning of an element. @@ -116,14 +116,14 @@ public: const ACEXML_Char *localName, const ACEXML_Char *qName, ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Begin the scope of a prefix-URI Namespace mapping. */ virtual void startPrefixMapping (const ACEXML_Char *prefix, const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/DTDHandler.h b/ACE/ACEXML/common/DTDHandler.h index 4f5f785552c..18800a43a2e 100644 --- a/ACE/ACEXML/common/DTDHandler.h +++ b/ACE/ACEXML/common/DTDHandler.h @@ -60,7 +60,7 @@ public: virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of an unparsed entity declaration event. @@ -69,7 +69,7 @@ public: const ACEXML_Char *publicId, const ACEXML_Char *systemId, const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; }; diff --git a/ACE/ACEXML/common/DefaultHandler.cpp b/ACE/ACEXML/common/DefaultHandler.cpp index ec2800c0685..02e7fd86126 100644 --- a/ACE/ACEXML/common/DefaultHandler.cpp +++ b/ACE/ACEXML/common/DefaultHandler.cpp @@ -17,14 +17,12 @@ ACEXML_DefaultHandler::characters (const ACEXML_Char *, size_t, size_t ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } void ACEXML_DefaultHandler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -33,14 +31,12 @@ void ACEXML_DefaultHandler::endElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } void ACEXML_DefaultHandler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -49,7 +45,6 @@ void ACEXML_DefaultHandler::ignorableWhitespace (const ACEXML_Char *, int, int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -57,7 +52,6 @@ ACEXML_DefaultHandler::ignorableWhitespace (const ACEXML_Char *, void ACEXML_DefaultHandler::processingInstruction (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -70,14 +64,12 @@ ACEXML_DefaultHandler::setDocumentLocator (ACEXML_Locator * ) void ACEXML_DefaultHandler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } void ACEXML_DefaultHandler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -87,7 +79,6 @@ ACEXML_DefaultHandler::startElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *, ACEXML_Attributes * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -95,7 +86,6 @@ ACEXML_DefaultHandler::startElement (const ACEXML_Char *, void ACEXML_DefaultHandler::startPrefixMapping (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -106,7 +96,6 @@ void ACEXML_DefaultHandler::notationDecl (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -116,7 +105,6 @@ ACEXML_DefaultHandler::unparsedEntityDecl (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -126,7 +114,6 @@ ACEXML_DefaultHandler::unparsedEntityDecl (const ACEXML_Char *, ACEXML_InputSource * ACEXML_DefaultHandler::resolveEntity (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. return 0; @@ -139,21 +126,18 @@ ACEXML_DefaultHandler::resolveEntity (const ACEXML_Char *, */ void ACEXML_DefaultHandler::error (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } void ACEXML_DefaultHandler::fatalError (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } void ACEXML_DefaultHandler::warning (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } diff --git a/ACE/ACEXML/common/DefaultHandler.h b/ACE/ACEXML/common/DefaultHandler.h index d1b39e84a0e..a729778201c 100644 --- a/ACE/ACEXML/common/DefaultHandler.h +++ b/ACE/ACEXML/common/DefaultHandler.h @@ -67,43 +67,37 @@ public: virtual void characters (const ACEXML_Char *ch, size_t start, size_t length - ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + ACEXML_ENV_ARG_DECL); /* * Receive notification of the end of a document. */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL); /* * Receive notification of the end of an element. */ virtual void endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *qName ACEXML_ENV_ARG_DECL); /* * End the scope of a prefix-URI mapping. */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL); /* * Receive notification of ignorable whitespace in element content. */ virtual void ignorableWhitespace (const ACEXML_Char *ch, int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + int length ACEXML_ENV_ARG_DECL); /* * Receive notification of a processing instruction. */ virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *data ACEXML_ENV_ARG_DECL); /* * Receive an object for locating the origin of SAX document events. @@ -113,14 +107,12 @@ public: /* * Receive notification of a skipped entity. */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL); /* * Receive notification of the beginning of a document. */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL); /* * Receive notification of the beginning of an element. @@ -128,15 +120,13 @@ public: virtual void startElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL); /* * Begin the scope of a prefix-URI Namespace mapping. */ virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *uri ACEXML_ENV_ARG_DECL); // *** Methods inherit from ACEXML_DTDHandler. @@ -145,8 +135,7 @@ public: */ virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL); /* * Receive notification of an unparsed entity declaration event. @@ -154,8 +143,7 @@ public: virtual void unparsedEntityDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL); // Methods inherit from ACEXML_EnitityResolver. @@ -163,28 +151,24 @@ public: * Allow the application to resolve external entities. */ virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL); // Methods inherit from ACEXML_ErrorHandler. /* * Receive notification of a recoverable error. */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL); /* * Receive notification of a non-recoverable error. */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL); /* * Receive notification of a warning. */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL); }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/Element_Def_Builder.h b/ACE/ACEXML/common/Element_Def_Builder.h index 9854dfad295..ace842fb17c 100644 --- a/ACE/ACEXML/common/Element_Def_Builder.h +++ b/ACE/ACEXML/common/Element_Def_Builder.h @@ -63,7 +63,7 @@ public: virtual int setElementName (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Define the content type of the element. @@ -71,7 +71,7 @@ public: * @retval 0 if valid, -1 otherwise. */ virtual int setContentType (CONTENT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Insert one more element into Mixed definition. @@ -79,7 +79,7 @@ public: virtual int insertMixedElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Start a new group of children. @@ -119,7 +119,7 @@ public: virtual int insertElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Dump the content of the attribute definition. diff --git a/ACE/ACEXML/common/EntityResolver.h b/ACE/ACEXML/common/EntityResolver.h index 80311b34d52..c1934724bad 100644 --- a/ACE/ACEXML/common/EntityResolver.h +++ b/ACE/ACEXML/common/EntityResolver.h @@ -52,7 +52,7 @@ public: */ virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; }; diff --git a/ACE/ACEXML/common/ErrorHandler.h b/ACE/ACEXML/common/ErrorHandler.h index 7103aaceaf5..4d8da5cc4a4 100644 --- a/ACE/ACEXML/common/ErrorHandler.h +++ b/ACE/ACEXML/common/ErrorHandler.h @@ -54,19 +54,19 @@ public: * Receive notification of a recoverable error. */ virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of a non-recoverable error. */ virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Receive notification of a warning. */ virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; }; diff --git a/ACE/ACEXML/common/Validator.h b/ACE/ACEXML/common/Validator.h index 0d006396498..fad96bf2f91 100644 --- a/ACE/ACEXML/common/Validator.h +++ b/ACE/ACEXML/common/Validator.h @@ -45,7 +45,7 @@ public: * @retval 0 if valid, -1 otherwise. */ virtual int startElement (ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Validate the next child element. @@ -55,7 +55,7 @@ public: virtual int nextElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; }; diff --git a/ACE/ACEXML/common/XMLFilterImpl.cpp b/ACE/ACEXML/common/XMLFilterImpl.cpp index c6bffafe1db..6e5be6b7efa 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.cpp +++ b/ACE/ACEXML/common/XMLFilterImpl.cpp @@ -33,7 +33,6 @@ ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl (void) void ACEXML_XMLFilterImpl::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->setupParser () < 0) { @@ -45,7 +44,6 @@ ACEXML_XMLFilterImpl::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) void ACEXML_XMLFilterImpl::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->setupParser () < 0) { @@ -58,8 +56,6 @@ ACEXML_XMLFilterImpl::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) int ACEXML_XMLFilterImpl::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { if (this->parent_ != 0) return this->parent_->getFeature (name ACEXML_ENV_ARG_PARAMETER); @@ -69,8 +65,6 @@ ACEXML_XMLFilterImpl::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) void * ACEXML_XMLFilterImpl::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { if (this->parent_ != 0) return this->parent_->getProperty (name ACEXML_ENV_ARG_PARAMETER); @@ -81,8 +75,6 @@ ACEXML_XMLFilterImpl::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) void ACEXML_XMLFilterImpl::setFeature (const ACEXML_Char *name, int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { if (this->parent_ != 0) { @@ -97,8 +89,6 @@ ACEXML_XMLFilterImpl::setFeature (const ACEXML_Char *name, void ACEXML_XMLFilterImpl::setProperty (const ACEXML_Char *name, void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { if (this->parent_ != 0) { @@ -127,7 +117,6 @@ ACEXML_XMLFilterImpl::characters (const ACEXML_Char *ch, size_t start, size_t length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->characters (ch, start, length ACEXML_ENV_ARG_PARAMETER); @@ -135,7 +124,6 @@ ACEXML_XMLFilterImpl::characters (const ACEXML_Char *ch, void ACEXML_XMLFilterImpl::endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->endDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); @@ -145,7 +133,6 @@ void ACEXML_XMLFilterImpl::endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->endElement (namespaceURI, @@ -155,7 +142,6 @@ ACEXML_XMLFilterImpl::endElement (const ACEXML_Char *namespaceURI, void ACEXML_XMLFilterImpl::endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->endPrefixMapping (prefix ACEXML_ENV_ARG_PARAMETER); @@ -165,7 +151,6 @@ void ACEXML_XMLFilterImpl::ignorableWhitespace (const ACEXML_Char *ch, int start, int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->ignorableWhitespace (ch, @@ -176,7 +161,6 @@ ACEXML_XMLFilterImpl::ignorableWhitespace (const ACEXML_Char *ch, void ACEXML_XMLFilterImpl::processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->processingInstruction (target, @@ -192,7 +176,6 @@ ACEXML_XMLFilterImpl::setDocumentLocator (ACEXML_Locator *locator) void ACEXML_XMLFilterImpl::skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->skippedEntity (name ACEXML_ENV_ARG_PARAMETER); @@ -200,7 +183,6 @@ ACEXML_XMLFilterImpl::skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL void ACEXML_XMLFilterImpl::startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->startDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); @@ -211,7 +193,6 @@ ACEXML_XMLFilterImpl::startElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName, ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->startElement (namespaceURI, @@ -223,7 +204,6 @@ ACEXML_XMLFilterImpl::startElement (const ACEXML_Char *namespaceURI, void ACEXML_XMLFilterImpl::startPrefixMapping (const ACEXML_Char *prefix, const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->contentHandler_ != 0) this->contentHandler_->startPrefixMapping (prefix, @@ -234,7 +214,6 @@ void ACEXML_XMLFilterImpl::notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->dtdHandler_ != 0) this->dtdHandler_->notationDecl (name, @@ -247,7 +226,6 @@ ACEXML_XMLFilterImpl::unparsedEntityDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId, const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->dtdHandler_ != 0) this->dtdHandler_->unparsedEntityDecl (name, @@ -259,7 +237,6 @@ ACEXML_XMLFilterImpl::unparsedEntityDecl (const ACEXML_Char *name, ACEXML_InputSource * ACEXML_XMLFilterImpl::resolveEntity (const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->entityResolver_ != 0) return this->entityResolver_->resolveEntity (publicId, @@ -269,7 +246,6 @@ ACEXML_XMLFilterImpl::resolveEntity (const ACEXML_Char *publicId, void ACEXML_XMLFilterImpl::error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->errorHandler_ != 0) this->errorHandler_->error (exception ACEXML_ENV_ARG_PARAMETER); @@ -277,7 +253,6 @@ ACEXML_XMLFilterImpl::error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_ void ACEXML_XMLFilterImpl::fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->errorHandler_ != 0) this->errorHandler_->fatalError (exception ACEXML_ENV_ARG_PARAMETER); @@ -285,7 +260,6 @@ ACEXML_XMLFilterImpl::fatalError (ACEXML_SAXParseException &exception ACEXML_ENV void ACEXML_XMLFilterImpl::warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->errorHandler_ != 0) this->errorHandler_->warning (exception ACEXML_ENV_ARG_PARAMETER); diff --git a/ACE/ACEXML/common/XMLFilterImpl.h b/ACE/ACEXML/common/XMLFilterImpl.h index 4e218563577..fa4913e0910 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.h +++ b/ACE/ACEXML/common/XMLFilterImpl.h @@ -58,45 +58,36 @@ public: /* * Look up the value of a feature. */ - virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL); /* * Look up the value of a property. */ - virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL); /* * Parse an XML document. */ - virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL); /* * Parse an XML document from a system identifier (URI). */ virtual void parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) // @@ throw IOException??? - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + ; /* * Set the state of a feature. */ virtual void setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + int boolean_value ACEXML_ENV_ARG_DECL); /* * Set the value of a property. */ virtual void setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + void *value ACEXML_ENV_ARG_DECL); /* * Get the parent reader. @@ -154,43 +145,37 @@ public: virtual void characters (const ACEXML_Char *ch, size_t start, size_t length - ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + ACEXML_ENV_ARG_DECL); /* * Receive notification of the end of a document. */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL); /* * Receive notification of the end of an element. */ virtual void endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *qName ACEXML_ENV_ARG_DECL); /* * End the scope of a prefix-URI mapping. */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL); /* * Receive notification of ignorable whitespace in element content. */ virtual void ignorableWhitespace (const ACEXML_Char *ch, int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + int length ACEXML_ENV_ARG_DECL); /* * Receive notification of a processing instruction. */ virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *data ACEXML_ENV_ARG_DECL); /* * Receive an object for locating the origin of SAX document events. @@ -200,14 +185,12 @@ public: /* * Receive notification of a skipped entity. */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL); /* * Receive notification of the beginning of a document. */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL); /* * Receive notification of the beginning of an element. @@ -215,15 +198,13 @@ public: virtual void startElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL); /* * Begin the scope of a prefix-URI Namespace mapping. */ virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *uri ACEXML_ENV_ARG_DECL); // *** Methods inherit from ACEXML_DTDHandler. @@ -232,8 +213,7 @@ public: */ virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL); /* * Receive notification of an unparsed entity declaration event. @@ -241,8 +221,7 @@ public: virtual void unparsedEntityDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL); // Methods inherit from ACEXML_EnitityResolver. @@ -250,28 +229,24 @@ public: * Allow the application to resolve external entities. */ virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL); // Methods inherit from ACEXML_ErrorHandler. /* * Receive notification of a recoverable error. */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL); /* * Receive notification of a non-recoverable error. */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL); /* * Receive notification of a warning. */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL); protected: int setupParser (void); // Set up the event handlers of parent parser to this. diff --git a/ACE/ACEXML/common/XMLReader.h b/ACE/ACEXML/common/XMLReader.h index c95024d3dd4..9cbc6bca7f2 100644 --- a/ACE/ACEXML/common/XMLReader.h +++ b/ACE/ACEXML/common/XMLReader.h @@ -71,27 +71,25 @@ public: * activated in the parser. */ virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; + = 0; /** * Look up the value of a property. */ virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; + = 0; /** * Parse an XML document. */ virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Parse an XML document from a system identifier (URI). */ virtual void parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; + = 0; /** * Allow an application to register a content event handler. @@ -118,16 +116,14 @@ public: */ virtual void setFeature (const ACEXML_Char *name, int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; + = 0; /** * Set the value of a property. */ virtual void setProperty (const ACEXML_Char *name, void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; + = 0; }; diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp index ea48494d7d1..4bcf19e1b07 100644 --- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp +++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp @@ -19,7 +19,6 @@ void ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, size_t start, size_t length ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -30,7 +29,6 @@ ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, void ACEXML_Print_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -43,7 +41,6 @@ ACEXML_Print_Handler::endElement (const ACEXML_Char *uri, const ACEXML_Char *name, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -55,7 +52,6 @@ ACEXML_Print_Handler::endElement (const ACEXML_Char *uri, void ACEXML_Print_Handler::endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -69,7 +65,6 @@ ACEXML_Print_Handler::ignorableWhitespace (const ACEXML_Char *, int, int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // ACE_DEBUG ((LM_DEBUG, // ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); @@ -79,7 +74,6 @@ void ACEXML_Print_Handler::processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -99,7 +93,6 @@ ACEXML_Print_Handler::setDocumentLocator (ACEXML_Locator * locator) void ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -110,7 +103,6 @@ ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name void ACEXML_Print_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -124,7 +116,6 @@ ACEXML_Print_Handler::startElement (const ACEXML_Char *uri, const ACEXML_Char *qName, ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -144,7 +135,6 @@ ACEXML_Print_Handler::startElement (const ACEXML_Char *uri, void ACEXML_Print_Handler::startPrefixMapping (const ACEXML_Char * prefix, const ACEXML_Char * uri ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event startPrefixMapping () ***************\n"))); @@ -158,7 +148,6 @@ void ACEXML_Print_Handler::notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicID, const ACEXML_Char *systemID ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event notationDecl: (%s) "), @@ -183,7 +172,6 @@ ACEXML_Print_Handler::unparsedEntityDecl (const ACEXML_Char *name, const ACEXML_Char *publicID, const ACEXML_Char *systemID, const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Unparsed Entity: %s"), @@ -208,7 +196,6 @@ ACEXML_Print_Handler::unparsedEntityDecl (const ACEXML_Char *name, ACEXML_InputSource * ACEXML_Print_Handler::resolveEntity (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. return 0; @@ -221,7 +208,6 @@ ACEXML_Print_Handler::resolveEntity (const ACEXML_Char *, */ void ACEXML_Print_Handler::error (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ", (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), @@ -232,7 +218,6 @@ ACEXML_Print_Handler::error (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_N void ACEXML_Print_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ", (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), @@ -244,7 +229,6 @@ ACEXML_Print_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DE void ACEXML_Print_Handler::warning (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ", (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h index 40402207911..c7beebc02b7 100644 --- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h +++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h @@ -44,14 +44,12 @@ public: virtual void characters (const ACEXML_Char *ch, size_t start, size_t length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of the end of a document. */ virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -60,14 +58,12 @@ public: virtual void endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * End the scope of a prefix-URI mapping. */ virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -76,7 +72,6 @@ public: virtual void ignorableWhitespace (const ACEXML_Char *ch, int start, int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -84,7 +79,6 @@ public: */ virtual void processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -96,14 +90,12 @@ public: * Receive notification of a skipped entity. */ virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of the beginning of a document. */ virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -113,7 +105,6 @@ public: const ACEXML_Char *localName, const ACEXML_Char *qName, ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -121,7 +112,6 @@ public: */ virtual void startPrefixMapping (const ACEXML_Char *prefix, const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // *** Methods inherit from ACEXML_DTDHandler. @@ -132,7 +122,6 @@ public: virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -142,7 +131,6 @@ public: const ACEXML_Char *publicId, const ACEXML_Char *systemId, const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // Methods inherit from ACEXML_EnitityResolver. @@ -152,7 +140,6 @@ public: */ virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // Methods inherit from ACEXML_ErrorHandler. @@ -161,21 +148,18 @@ public: * Receive notification of a recoverable error. */ virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of a non-recoverable error. */ virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of a warning. */ virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; private: diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp index b25a1d5c3c1..90182166b17 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp @@ -24,7 +24,6 @@ ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata, size_t, size_t ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), @@ -33,7 +32,6 @@ ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata, void ACEXML_SAXPrint_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -45,7 +43,6 @@ ACEXML_SAXPrint_Handler::endElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -59,7 +56,6 @@ ACEXML_SAXPrint_Handler::endElement (const ACEXML_Char *, void ACEXML_SAXPrint_Handler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // ACE_DEBUG ((LM_DEBUG, // ACE_TEXT ("* Event endPrefixMapping (%s) ***************\n"), @@ -70,7 +66,6 @@ void ACEXML_SAXPrint_Handler::ignorableWhitespace (const ACEXML_Char * cdata, int, int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), @@ -83,7 +78,6 @@ void ACEXML_SAXPrint_Handler::processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -104,7 +98,6 @@ ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) void ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -115,7 +108,6 @@ ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name void ACEXML_SAXPrint_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -129,7 +121,6 @@ ACEXML_SAXPrint_Handler::startElement (const ACEXML_Char *, const ACEXML_Char *qName, ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { @@ -151,7 +142,6 @@ ACEXML_SAXPrint_Handler::startElement (const ACEXML_Char *, void ACEXML_SAXPrint_Handler::startPrefixMapping (const ACEXML_Char * , const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // ACE_DEBUG ((LM_DEBUG, // ACE_TEXT ("* Event startPrefixMapping () ***************\n"))); @@ -166,7 +156,6 @@ void ACEXML_SAXPrint_Handler::notationDecl (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -176,7 +165,6 @@ ACEXML_SAXPrint_Handler::unparsedEntityDecl (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. } @@ -186,7 +174,6 @@ ACEXML_SAXPrint_Handler::unparsedEntityDecl (const ACEXML_Char *, ACEXML_InputSource * ACEXML_SAXPrint_Handler::resolveEntity (const ACEXML_Char *, const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // No-op. return 0; @@ -200,7 +187,6 @@ ACEXML_SAXPrint_Handler::resolveEntity (const ACEXML_Char *, void ACEXML_SAXPrint_Handler::error (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ", (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), @@ -212,7 +198,6 @@ ACEXML_SAXPrint_Handler::error (ACEXML_SAXParseException & ex void ACEXML_SAXPrint_Handler::fatalError (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ", (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), @@ -224,7 +209,6 @@ ACEXML_SAXPrint_Handler::fatalError (ACEXML_SAXParseException & ex void ACEXML_SAXPrint_Handler::warning (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ", (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h index 7b14ac89c79..1f7ba8381b4 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h @@ -45,14 +45,12 @@ public: size_t start, size_t length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of the end of a document. */ virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -61,14 +59,12 @@ public: virtual void endElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * End the scope of a prefix-URI mapping. */ virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -77,7 +73,6 @@ public: virtual void ignorableWhitespace (const ACEXML_Char *ch, int start, int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -85,7 +80,6 @@ public: */ virtual void processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -97,14 +91,12 @@ public: * Receive notification of a skipped entity. */ virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of the beginning of a document. */ virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -114,7 +106,6 @@ public: const ACEXML_Char *localName, const ACEXML_Char *qName, ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -122,7 +113,6 @@ public: */ virtual void startPrefixMapping (const ACEXML_Char *prefix, const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // *** Methods inherit from ACEXML_DTDHandler. @@ -133,7 +123,6 @@ public: virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -143,7 +132,6 @@ public: const ACEXML_Char *publicId, const ACEXML_Char *systemId, const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // Methods inherit from ACEXML_EnitityResolver. @@ -153,7 +141,6 @@ public: */ virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; // Methods inherit from ACEXML_ErrorHandler. @@ -162,21 +149,18 @@ public: * Receive notification of a recoverable error. */ virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of a non-recoverable error. */ virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* * Receive notification of a warning. */ virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; void inc_indent (); diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp index 65ae6e3776d..ccebd4b9098 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp +++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp @@ -38,7 +38,6 @@ ACEXML_Debug_Attribute_Builder::getName (void) int ACEXML_Debug_Attribute_Builder::setAttType (const ATT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->type_ == ERROR_TYPE) { @@ -52,7 +51,6 @@ ACEXML_Debug_Attribute_Builder::setAttType (const ATT_TYPE type int ACEXML_Debug_Attribute_Builder::insertList (const ACEXML_Char *n ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_String str (n, 0, 0); @@ -64,7 +62,6 @@ int ACEXML_Debug_Attribute_Builder::setDefault (const DEFAULT_DECL def, const ACEXML_Char *value ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->default_decl_ = def; this->default_value_.set (value, 0); @@ -163,7 +160,6 @@ int ACEXML_Debug_Attributes_Builder::setElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->element_name_.set (qName, 0); return 0; diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h index 42a8273e2fe..e22b6ef936a 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h +++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h @@ -50,21 +50,18 @@ public: /** * Set the attribute type. */ - virtual int setAttType (const ATT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual int setAttType (const ATT_TYPE type ACEXML_ENV_ARG_DECL); /** * Insert an element for NOTATION or ENUMERATION type attribute. */ - virtual int insertList (const ACEXML_Char *Name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual int insertList (const ACEXML_Char *Name ACEXML_ENV_ARG_DECL); /** * Set default attribute declaration. */ virtual int setDefault (const DEFAULT_DECL def, const ACEXML_Char *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /** @@ -138,7 +135,6 @@ public: virtual int setElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /** diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp index 48fff495365..da422a3429f 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp +++ b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp @@ -18,7 +18,6 @@ int ACEXML_Debug_Element_Builder::setElementName (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->element_.set (qName, 0); return 0; @@ -26,7 +25,6 @@ ACEXML_Debug_Element_Builder::setElementName (const ACEXML_Char *, int ACEXML_Debug_Element_Builder::setContentType (CONTENT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->type_ == UNDEFINED) { @@ -41,7 +39,6 @@ int ACEXML_Debug_Element_Builder::insertMixedElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Element_Tree_Name_Node *node; @@ -108,7 +105,6 @@ int ACEXML_Debug_Element_Builder::insertElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Element_Tree_Name_Node *node; diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h index 79443b276ea..dc1f7765441 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h +++ b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h @@ -45,7 +45,6 @@ public: virtual int setElementName (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /** @@ -54,7 +53,6 @@ public: * @retval 0 if valid, -1 otherwise. */ virtual int setContentType (CONTENT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /** @@ -63,7 +61,6 @@ public: virtual int insertMixedElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /** @@ -104,7 +101,6 @@ public: virtual int insertElement (const ACEXML_Char *namespaceURI, const ACEXML_Char *localName, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /** diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp index 5d029b08e27..a7d4b8aab42 100644 --- a/ACE/ACEXML/parser/parser/Parser.cpp +++ b/ACE/ACEXML/parser/parser/Parser.cpp @@ -85,7 +85,6 @@ ACEXML_Parser::initialize(ACEXML_InputSource* input) void ACEXML_Parser::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_InputSource* input = 0; ACE_NEW (input, ACEXML_InputSource (systemId)); @@ -94,7 +93,6 @@ ACEXML_Parser::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) void ACEXML_Parser::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (input == 0) { @@ -235,7 +233,6 @@ ACEXML_Parser::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) int ACEXML_Parser::parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0) { @@ -311,7 +308,6 @@ ACEXML_Parser::parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->ref_state_ = ACEXML_ParserInt::IN_INT_DTD; ACEXML_Char nextch = this->skip_whitespace (); @@ -366,7 +362,6 @@ ACEXML_Parser::parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_external_dtd (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD; ACEXML_Char* publicId = 0; @@ -417,7 +412,6 @@ ACEXML_Parser::parse_external_dtd (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_external_subset (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD; this->external_subset_ = 1; @@ -473,7 +467,6 @@ ACEXML_Parser::parse_external_subset (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char ch = this->get (); int include = 0; @@ -551,7 +544,6 @@ ACEXML_Parser::parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_ignoresect (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char nextch = this->skip_whitespace(); int count = 0; @@ -607,7 +599,6 @@ ACEXML_Parser::parse_ignoresect (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_includesect (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char nextch = this->skip_whitespace(); do { @@ -666,7 +657,6 @@ ACEXML_Parser::parse_includesect (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_markup_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char nextch = this->peek (); switch (nextch) @@ -725,7 +715,6 @@ int ACEXML_Parser::parse_external_id (ACEXML_Char *&publicId, ACEXML_Char *&systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { publicId = systemId = 0; ACEXML_Char nextch = this->get (); @@ -823,7 +812,6 @@ ACEXML_Parser::normalize_systemid (const ACEXML_Char* systemId) void ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // Parse STag. const ACEXML_Char *startname = this->parse_name (); @@ -991,7 +979,6 @@ int ACEXML_Parser::parse_content (const ACEXML_Char* startname, const ACEXML_Char*& ns_uri, const ACEXML_Char*& ns_lname, int ns_flag ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char *cdata; size_t cdata_length = 0; @@ -1172,7 +1159,6 @@ ACEXML_Parser::parse_content (const ACEXML_Char* startname, int ACEXML_Parser::parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->parse_token (ACE_TEXT ("[CDATA[")) < 0) { @@ -1215,7 +1201,6 @@ ACEXML_Parser::parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char nextch = 0; @@ -1380,7 +1365,6 @@ ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->parse_token (ACE_TEXT ("ATTLIST")) < 0) { @@ -1497,7 +1481,6 @@ ACEXML_Parser::check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) ACEXML_Char* ACEXML_Parser::parse_attname (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // Parse attribute name ACEXML_Char *att_name = this->parse_name (); @@ -1512,7 +1495,6 @@ ACEXML_Parser::parse_attname (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue) ACEXML_Char nextch = this->peek (); @@ -1588,7 +1570,6 @@ ACEXML_Parser::parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char ch = this->get(); switch (ch) @@ -1710,7 +1691,6 @@ ACEXML_Parser::parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_DECL) */ int ACEXML_Parser::parse_atttype (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char nextch = this->peek(); switch (nextch) @@ -1833,7 +1813,6 @@ ACEXML_Parser::parse_atttype (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->parse_token (ACE_TEXT ("NOTATION")) < 0) { @@ -1919,7 +1898,6 @@ ACEXML_Parser::parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->parse_token (ACE_TEXT ("LEMENT")) < 0) { @@ -1994,7 +1972,6 @@ ACEXML_Parser::parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { this->get (); // consume the '(' this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); @@ -2067,7 +2044,6 @@ ACEXML_Parser::parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // Conditionally consume the open paren. if (skip_open_paren == 0 && this->get () != '(') @@ -2276,7 +2252,6 @@ ACEXML_Parser::parse_reference_name (void) int ACEXML_Parser::parse_attvalue (ACEXML_Char *&str ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char quote = this->get (); if (quote != '\'' && quote != '"') // Not a quoted string. @@ -2360,7 +2335,6 @@ ACEXML_Parser::parse_attvalue (ACEXML_Char *&str ACEXML_ENV_ARG_DECL) int ACEXML_Parser::parse_entity_reference (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char* replace = this->parse_reference_name (); if (replace == 0) @@ -2513,7 +2487,6 @@ ACEXML_Parser::parse_entity_reference (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char* replace = this->parse_reference_name (); if (replace == 0) @@ -2655,7 +2628,6 @@ ACEXML_Parser::parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_entity_value (ACEXML_Char *&str ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_ParserInt::ReferenceState temp = this->ref_state_; ACEXML_Char quote = this->get (); @@ -2904,7 +2876,6 @@ void ACEXML_Parser::prefix_mapping (const ACEXML_Char* prefix, const ACEXML_Char* uri, int start ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { if (this->namespaces_) { @@ -3023,8 +2994,6 @@ ACEXML_Parser::pop_context (int GE_ref ACEXML_ENV_ARG_DECL) int ACEXML_Parser::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { if (ACE_OS::strcmp (name, ACEXML_Parser::simple_parsing_feature_) == 0) { @@ -3051,8 +3020,6 @@ ACEXML_Parser::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) void ACEXML_Parser::setFeature (const ACEXML_Char *name, int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { if (ACE_OS::strcmp (name, ACEXML_Parser::simple_parsing_feature_) == 0) { @@ -3081,8 +3048,6 @@ ACEXML_Parser::setFeature (const ACEXML_Char *name, void * ACEXML_Parser::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (name), 0); } @@ -3090,8 +3055,6 @@ ACEXML_Parser::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) void ACEXML_Parser::setProperty (const ACEXML_Char *name, void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) { ACE_UNUSED_ARG (value); @@ -3100,7 +3063,6 @@ ACEXML_Parser::setProperty (const ACEXML_Char *name, void ACEXML_Parser::error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_SAXParseException* exception = 0; ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); @@ -3113,7 +3075,6 @@ ACEXML_Parser::error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) void ACEXML_Parser::warning (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_SAXParseException* exception = 0; ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); @@ -3125,7 +3086,6 @@ ACEXML_Parser::warning (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) void ACEXML_Parser::fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_SAXParseException* exception = 0; ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); @@ -3138,7 +3098,6 @@ ACEXML_Parser::fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) void ACEXML_Parser::parse_version_info (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char* astring; if (this->parse_token (ACE_TEXT("ersion")) < 0 @@ -3159,7 +3118,6 @@ ACEXML_Parser::parse_version_info (ACEXML_ENV_SINGLE_ARG_DECL) void ACEXML_Parser::parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACEXML_Char* astring = 0; if ((this->parse_token (ACE_TEXT("ncoding")) < 0) @@ -3183,7 +3141,6 @@ ACEXML_Parser::parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_text_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // Read xml if (this->parse_token (ACE_TEXT("xml")) < 0) @@ -3225,7 +3182,6 @@ ACEXML_Parser::parse_text_decl (ACEXML_ENV_SINGLE_ARG_DECL) void ACEXML_Parser::parse_xml_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { // Read <?xml if (this->parse_token (ACE_TEXT("xml")) < 0) @@ -3305,7 +3261,6 @@ ACEXML_Parser::parse_comment (void) int ACEXML_Parser::parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { const ACEXML_Char *pitarget = this->parse_name (); ACEXML_Char *instruction = 0; diff --git a/ACE/ACEXML/parser/parser/Parser.h b/ACE/ACEXML/parser/parser/Parser.h index 228cb749015..3b0725ec214 100644 --- a/ACE/ACEXML/parser/parser/Parser.h +++ b/ACE/ACEXML/parser/parser/Parser.h @@ -83,44 +83,34 @@ public: * programmers to check whether a specific feature has been * activated in the parser. */ - virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL); /** * Activating or deactivating a feature. */ virtual void setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + int boolean_value ACEXML_ENV_ARG_DECL); /* * Look up the value of a property. */ - virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL); /* * Set the value of a property. */ virtual void setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; + void *value ACEXML_ENV_ARG_DECL); /* * Parse an XML document. */ - virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; + virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL); /* * Parse an XML document from a system identifier (URI). */ virtual void parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; /* @@ -149,35 +139,30 @@ protected: /** * Parse XML Prolog. */ - void parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse VersionInfo declaration. * */ - void parse_version_info (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void parse_version_info (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a EncodingDecl declaration. * */ - void parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a XMLDecl declaration. * */ - void parse_xml_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void parse_xml_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a TextDecl declaration. */ - int parse_text_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_text_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a PI statement. The first character encountered @@ -185,15 +170,13 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse the DOCTYPE declaration. The first character encountered * should always be 'D' in doctype prefix: "@<@!DOCTYPE". */ - int parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an XML element. The first character encountered should @@ -208,8 +191,7 @@ protected: * of validator or allow the function to return the element name so it * can be used in a validator. */ - void parse_element (int is_root ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void parse_element (int is_root ACEXML_ENV_ARG_DECL); /** * Parse a content declaration. @@ -217,8 +199,7 @@ protected: */ int parse_content (const ACEXML_Char* startname, const ACEXML_Char*& ns_uri, const ACEXML_Char*& ns_lname, int ns_flag - ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + ACEXML_ENV_ARG_DECL); /** * Parse a character reference, i.e., " " or "". The first @@ -250,15 +231,13 @@ protected: * @retval 0 on success. * @retval -1 if fail. */ - int parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a "markupdecl" section, this includes both "markupdecl" and * "DeclSep" sections in XML specification */ - int parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL); /** * Skip over a comment. The first character encountered should always be @@ -273,8 +252,7 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an "ENTITY" decl. The first character this method expects @@ -282,8 +260,7 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an "ATTLIST" decl. Thse first character this method @@ -292,15 +269,13 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a AttType declaration. * */ - int parse_atttype (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_atttype (ACEXML_ENV_SINGLE_ARG_DECL); /** *Parse a "NOTATION" decl. The first character this method @@ -309,8 +284,7 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an ExternalID or a reference to PUBLIC ExternalID. @@ -333,79 +307,68 @@ protected: * @retval 0 on success, -1 otherwise. */ int parse_external_id (ACEXML_Char *&publicId, ACEXML_Char *&systemId - ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + ACEXML_ENV_ARG_DECL); /** * Parse an external DTD. * */ - int parse_external_dtd (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_external_dtd (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an external subset. This does the actual parsing of an external * subset and is called by @sa parse_external_dtd. * */ - int parse_external_subset (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_external_subset (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a markupDecl section. * */ - int parse_markup_decl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_markup_decl (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a conditionalSect declaration. * */ - int parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a includeSect declaration. * */ - int parse_includesect (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_includesect (ACEXML_ENV_SINGLE_ARG_DECL); /** * * Parse a ignoreSect declaration. */ - int parse_ignoresect (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_ignoresect (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a PEReference. * */ - int parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a Reference. * */ - int parse_entity_reference (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_entity_reference (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an entityValue. * */ - int parse_entity_value (ACEXML_Char *&str ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_entity_value (ACEXML_Char *&str ACEXML_ENV_ARG_DECL); /** * Parse a DefaultDecl specification. * */ - int parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_DECL); /** @@ -416,8 +379,7 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a @c cp non-terminal. @c cp can either be a @c seq or a @c choice. @@ -429,8 +391,7 @@ protected: * * @retval 0 on success, -1 otherwise. */ - int parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL); /** * Parse a name from the input CharStream. If @a ch @!= 0, then we have @@ -487,8 +448,7 @@ protected: * if successful. * @retval 0 otherwise. */ - ACEXML_Char* parse_attname (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + ACEXML_Char* parse_attname (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse an attribute value. @@ -496,16 +456,14 @@ protected: * @param str String containing the value of the attribute if successful. * @return 0 if attribute value was read successfully, -1 otherwise. */ - int parse_attvalue (ACEXML_Char*& str ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_attvalue (ACEXML_Char*& str ACEXML_ENV_ARG_DECL); /** * Parse a tokenized type attribute. * * @return 0 if attribute type was read successfully, -1 otherwise. */ - int parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_DECL); /** * Parse a SystemLiteral. @@ -666,22 +624,19 @@ private: * Dispatch errors to ErrorHandler. * */ - void error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL); /** * Dispatch warnings to ErrorHandler. * */ - void warning (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void warning (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL); /** * Dispatch fatal errors to ErrorHandler. * */ - void fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + void fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL); /** * Dispatch prefix mapping calls to the ContentHandler. @@ -693,8 +648,7 @@ private: */ void prefix_mapping (const ACEXML_Char* prefix, const ACEXML_Char* uri, - int start ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + int start ACEXML_ENV_ARG_DECL); /** * Parse a keyword. */ diff --git a/ACE/ACEXML/tests/ContentHandler_Test.cpp b/ACE/ACEXML/tests/ContentHandler_Test.cpp index 05e85157fd7..7c7e2c5594b 100644 --- a/ACE/ACEXML/tests/ContentHandler_Test.cpp +++ b/ACE/ACEXML/tests/ContentHandler_Test.cpp @@ -23,8 +23,7 @@ public: */ virtual void characters (const ACEXML_Char *ch, size_t start, - size_t length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + size_t length ACEXML_ENV_ARG_DECL); const ACEXML_Char *get_test_string (void) { return Basic_Content_Tester::test_string_; } @@ -42,7 +41,6 @@ void Basic_Content_Tester::characters (const ACEXML_Char *ch, size_t start, size_t length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) { static int already_called = 0; static const ACEXML_Char *expect = |