X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fxml%2FXPath.cpp;h=8d46fd17781bb8f4889fff8b1ebd80075f8ef0ae;hb=64cc135e716c2ef018227375fc4f15ff0670fdf7;hp=77803d9d94423585cc90938b8f12f14a36b2f17b;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git diff --git a/source/xml/XPath.cpp b/source/xml/XPath.cpp index 77803d9..8d46fd1 100644 --- a/source/xml/XPath.cpp +++ b/source/xml/XPath.cpp @@ -36,7 +36,7 @@ xml::XPath::XPath(const char* name) { * Los nodos se recuperan mediante los métodos node_begin, node_end y node */ void xml::XPath::apply(const Document& document, const char* expression, const int mode) -throw(RuntimeException) { +noexcept(false) { a_mode = mode; ConfigSkeleton configSkeleton(&XPath::callbackApply); @@ -47,7 +47,7 @@ throw(RuntimeException) { } bool xml::XPath::match(const Document& document, const char* expression, const int mode) -throw(RuntimeException) { +noexcept(false) { a_result = false; ConfigSkeleton configSkeleton(&XPath::callbackMatch); @@ -65,9 +65,8 @@ throw(RuntimeException) { } const xml::Node* xml::XPath::find(const Document& document, const char* expression, const int mode, const Exception::Mode::_v emode) -throw(RuntimeException) { +noexcept(false) { apply(document, expression, mode); - const xml::Node* result = NULL; Node::const_child_iterator ii = node_begin(); if(ii == node_end()) { @@ -97,7 +96,7 @@ throw(RuntimeException) { } void xml::XPath::skeleton(const Document& document, const char* expression, xml::XPath::ConfigSkeleton& config) -throw(RuntimeException) { +noexcept(false) { LOGDEBUG( string msg("xml::XPath::skeleton | Document: "); msg += functions::asString(document.getContent()); @@ -147,7 +146,7 @@ throw(RuntimeException) { * lo que nos obliga a recorrerlo en profundidad. */ void xml::XPath::initializeNamespaces(_xmlXPathContext* context, const Document& document) -throw(RuntimeException) { +noexcept(false) { xmlNode* root; if((root = xmlDocGetRootElement(document.a_handle)) == NULL) @@ -158,7 +157,7 @@ throw(RuntimeException) { } void xml::XPath::forwardNamespaces(_xmlXPathContext* context, _xmlNode* xmlNode) -throw(RuntimeException) { +noexcept(false) { while(xmlNode != NULL) { if(xmlNode->type == XML_ELEMENT_NODE) { for(xmlNs* ns = xmlNode->nsDef; ns != NULL; ns = ns->next) { @@ -215,7 +214,7 @@ void xml::XPath::callbackMatch(const _xmlNodeSet* nodes) { } void xml::XPath::text(Node* node, xmlNode* xmlNode) -throw(RuntimeException) { +noexcept(false) { bool isSeparator; const char* w; @@ -238,6 +237,9 @@ throw(RuntimeException) { node->createText(decode(xmlNode->content)); return; + + default: + ; } xmlNode = xmlNode->next;