From b65f7be0b3fe51d393b25022c44e4b2fad620d1f Mon Sep 17 00:00:00 2001 From: Jez Higgins Date: Sat, 5 Jan 2013 21:26:35 +0000 Subject: [PATCH] Applied Oncaphillis' patch for gcc 4.7 --- include/XSLT/impl/xslt_apply_templates.hpp | 2 +- include/XSLT/impl/xslt_attribute.hpp | 2 +- include/XSLT/impl/xslt_choose.hpp | 4 ++-- include/XSLT/impl/xslt_comment.hpp | 2 +- include/XSLT/impl/xslt_copy.hpp | 10 +++++----- include/XSLT/impl/xslt_element.hpp | 2 +- include/XSLT/impl/xslt_for_each.hpp | 4 ++-- include/XSLT/impl/xslt_functions.hpp | 4 ++-- include/XSLT/impl/xslt_if.hpp | 2 +- include/XSLT/impl/xslt_inline_element.hpp | 2 +- include/XSLT/impl/xslt_message.hpp | 2 +- include/XSLT/impl/xslt_processing_instruction.hpp | 2 +- include/XSLT/impl/xslt_template.hpp | 2 +- include/XSLT/impl/xslt_variable_impl.hpp | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/XSLT/impl/xslt_apply_templates.hpp b/include/XSLT/impl/xslt_apply_templates.hpp index 6c776bf6..1a423ef8 100644 --- a/include/XSLT/impl/xslt_apply_templates.hpp +++ b/include/XSLT/impl/xslt_apply_templates.hpp @@ -48,7 +48,7 @@ public: throw std::runtime_error("apply-templates select expression is not a node-set"); nodes = value.asNodeSet(); } - sort(node, nodes, context); + this->sort(node, nodes, context); context.stylesheet().applyTemplates(nodes, context, mode_); } // execute diff --git a/include/XSLT/impl/xslt_attribute.hpp b/include/XSLT/impl/xslt_attribute.hpp index 7d890db7..8b8a1415 100644 --- a/include/XSLT/impl/xslt_attribute.hpp +++ b/include/XSLT/impl/xslt_attribute.hpp @@ -56,7 +56,7 @@ public: context.sink().start_attribute(name, namesp); ChainStackFrame frame(context); - execute_children(node, context); + this->execute_children(node, context); context.sink().end_attribute(); } // execute diff --git a/include/XSLT/impl/xslt_choose.hpp b/include/XSLT/impl/xslt_choose.hpp index cb4f4951..9322a5f8 100644 --- a/include/XSLT/impl/xslt_choose.hpp +++ b/include/XSLT/impl/xslt_choose.hpp @@ -32,7 +32,7 @@ public: virtual void execute(const DOM::Node& node, ExecutionContext& context) const { - execute_children(node, context); + this->execute_children(node, context); } // execute private: @@ -49,7 +49,7 @@ public: virtual void execute(const DOM::Node& node, ExecutionContext& context) const { - execute_children(node, context); + this->execute_children(node, context); } // execute }; // class Otherwise diff --git a/include/XSLT/impl/xslt_comment.hpp b/include/XSLT/impl/xslt_comment.hpp index e7a1729c..014d6a1f 100644 --- a/include/XSLT/impl/xslt_comment.hpp +++ b/include/XSLT/impl/xslt_comment.hpp @@ -22,7 +22,7 @@ public: { context.sink().start_comment(); - execute_children(node, context); + this->execute_children(node, context); context.sink().end_comment(); } // execute diff --git a/include/XSLT/impl/xslt_copy.hpp b/include/XSLT/impl/xslt_copy.hpp index a80237a4..1e839fd6 100644 --- a/include/XSLT/impl/xslt_copy.hpp +++ b/include/XSLT/impl/xslt_copy.hpp @@ -82,13 +82,13 @@ public: virtual void execute(const DOM::Node& node, ExecutionContext& context) const { - copy(node, context); + this->copy(node, context); } // execute protected: virtual void process_content(const DOM::Node& node, ExecutionContext& context) const { - execute_children(node, context); + this->execute_children(node, context); } // process_content private: @@ -120,7 +120,7 @@ public: Arabica::XPath::NodeSet nodes = value.asNodeSet(); for(typename Arabica::XPath::NodeSet::const_iterator n = nodes.begin(), e = nodes.end(); n != e; ++n) - copy(*n, context); + this->copy(*n, context); } // execute protected: @@ -130,11 +130,11 @@ protected: { const DOM::NamedNodeMap& attrs = node.getAttributes(); for(unsigned int a = 0; a < attrs.getLength(); ++a) - copy(attrs.item(a), context); + this->copy(attrs.item(a), context); } // if ... for(DOM::Node n = node.getFirstChild(); n != 0; n = n.getNextSibling()) - copy(n, context); + this->copy(n, context); } // process_content private: diff --git a/include/XSLT/impl/xslt_element.hpp b/include/XSLT/impl/xslt_element.hpp index 1a225954..ec40da11 100644 --- a/include/XSLT/impl/xslt_element.hpp +++ b/include/XSLT/impl/xslt_element.hpp @@ -57,7 +57,7 @@ public: if(context.sink().start_element(name, namesp)) { ChainStackFrame frame(context); - execute_children(node, context); + this->execute_children(node, context); context.sink().end_element(name, namesp); } } // execute diff --git a/include/XSLT/impl/xslt_for_each.hpp b/include/XSLT/impl/xslt_for_each.hpp index d7f50bfd..b3321417 100644 --- a/include/XSLT/impl/xslt_for_each.hpp +++ b/include/XSLT/impl/xslt_for_each.hpp @@ -40,14 +40,14 @@ public: throw SAX::SAXException("xsl:for-each must select a node set"); NodeSet nodes = sel.asNodeSet(); - sort(node, nodes, context); + this->sort(node, nodes, context); LastFrame last(context, nodes.size()); for(size_t n = 0, e = nodes.size(); n != e; ++n) { ChainStackFrame frame(context); context.setPosition(nodes[n], n+1); - execute_children(nodes[n], context); + this->execute_children(nodes[n], context); } // for ... } // execute diff --git a/include/XSLT/impl/xslt_functions.hpp b/include/XSLT/impl/xslt_functions.hpp index a6d26e09..376fe30d 100644 --- a/include/XSLT/impl/xslt_functions.hpp +++ b/include/XSLT/impl/xslt_functions.hpp @@ -43,7 +43,7 @@ protected: { NodeSet nodes; - XPathValue a0 = arg(0, context, executionContext); + XPathValue a0 = this->arg(0, context, executionContext); if(baseT::argCount() != 1) throw Arabica::XPath::UnsupportedException("two arg version of document()"); if(a0.type() != Arabica::XPath::STRING) @@ -107,7 +107,7 @@ protected: virtual NodeSet doEvaluate(const DOMNode& context, const XPathExecutionContext& executionContext) const { - string_type keyname = argAsString(0, context, executionContext); + string_type keyname = this->argAsString(0, context, executionContext); string_type keyClarkName = QualifiedName::parseQName(keyname, true, namespaces_).clarkName(); XPathValue a1 = baseT::arg(1, context, executionContext); diff --git a/include/XSLT/impl/xslt_if.hpp b/include/XSLT/impl/xslt_if.hpp index 4e24f1f3..3c84898d 100644 --- a/include/XSLT/impl/xslt_if.hpp +++ b/include/XSLT/impl/xslt_if.hpp @@ -27,7 +27,7 @@ public: { ChainStackFrame frame(context); if(test_->evaluateAsBool(node, context.xpathContext())) - execute_children(node, context); + this->execute_children(node, context); } // execute private: diff --git a/include/XSLT/impl/xslt_inline_element.hpp b/include/XSLT/impl/xslt_inline_element.hpp index f4694d63..4ab78b3b 100644 --- a/include/XSLT/impl/xslt_inline_element.hpp +++ b/include/XSLT/impl/xslt_inline_element.hpp @@ -76,7 +76,7 @@ public: a->execute(node, context); ChainStackFrame frame(context); - execute_children(node, context); + this->execute_children(node, context); context.sink().end_element(name_, namespace_); } } // execute diff --git a/include/XSLT/impl/xslt_message.hpp b/include/XSLT/impl/xslt_message.hpp index 60ba331f..15379efa 100644 --- a/include/XSLT/impl/xslt_message.hpp +++ b/include/XSLT/impl/xslt_message.hpp @@ -25,7 +25,7 @@ public: virtual void execute(const DOM::Node& node, ExecutionContext& context) const { RedirectionFrame toMessageSink(context); - execute_children(node, context); + this->execute_children(node, context); if(terminate_) throw SAX::SAXException("Stylesheet terminated by xsl:message"); diff --git a/include/XSLT/impl/xslt_processing_instruction.hpp b/include/XSLT/impl/xslt_processing_instruction.hpp index cbc78122..0e614904 100644 --- a/include/XSLT/impl/xslt_processing_instruction.hpp +++ b/include/XSLT/impl/xslt_processing_instruction.hpp @@ -30,7 +30,7 @@ public: validate_name(name); context.sink().start_processing_instruction(name); - execute_children(node, context); + this->execute_children(node, context); context.sink().end_processing_instruction(); } // execute diff --git a/include/XSLT/impl/xslt_template.hpp b/include/XSLT/impl/xslt_template.hpp index 03045f30..062d578c 100644 --- a/include/XSLT/impl/xslt_template.hpp +++ b/include/XSLT/impl/xslt_template.hpp @@ -54,7 +54,7 @@ public: virtual void execute(const DOM::Node& node, ExecutionContext& context) const { - execute_children(node, context); + this->execute_children(node, context); } // execute const MatchExprList& compiled_matches() const { return matches_; } diff --git a/include/XSLT/impl/xslt_variable_impl.hpp b/include/XSLT/impl/xslt_variable_impl.hpp index b7b13a3b..529dde52 100644 --- a/include/XSLT/impl/xslt_variable_impl.hpp +++ b/include/XSLT/impl/xslt_variable_impl.hpp @@ -43,7 +43,7 @@ public: if(select_) return select_->evaluate(node, context.xpathContext()); - execute_children(node, context); + this->execute_children(node, context); if(sink.node() == 0) return StringValue::createValue(string_adaptor::empty_string());