Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-02-06 20:46:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Applied Oncaphillis' patch for gcc 4.7

Browse source
This commit is contained in:
Jez Higgins 2013-01-05 21:26:35 +00:00
parent 68e6fec8b6
commit b65f7be0b3
14 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/XSLT/impl/xslt_apply_templates.hpp
View file

@ -48,7 +48,7 @@ public:
throw std::runtime_error("apply-templates select expression is not a node-set"); throw std::runtime_error("apply-templates select expression is not a node-set");
nodes = value.asNodeSet(); nodes = value.asNodeSet();
} }
sort(node, nodes, context); this->sort(node, nodes, context);
context.stylesheet().applyTemplates(nodes, context, mode_); context.stylesheet().applyTemplates(nodes, context, mode_);
} // execute } // execute

2
include/XSLT/impl/xslt_attribute.hpp
View file

@ -56,7 +56,7 @@ public:
context.sink().start_attribute(name, namesp); context.sink().start_attribute(name, namesp);
ChainStackFrame<string_type, string_adaptor> frame(context); ChainStackFrame<string_type, string_adaptor> frame(context);
execute_children(node, context); this->execute_children(node, context);
context.sink().end_attribute(); context.sink().end_attribute();
} // execute } // execute

4
include/XSLT/impl/xslt_choose.hpp
View file

@ -32,7 +32,7 @@ public:
virtual void execute(const DOM::Node<string_type, string_adaptor>& node, virtual void execute(const DOM::Node<string_type, string_adaptor>& node,
ExecutionContext<string_type, string_adaptor>& context) const ExecutionContext<string_type, string_adaptor>& context) const
{ {
execute_children(node, context); this->execute_children(node, context);
} // execute } // execute
private: private:
@ -49,7 +49,7 @@ public:
virtual void execute(const DOM::Node<string_type, string_adaptor>& node, virtual void execute(const DOM::Node<string_type, string_adaptor>& node,
ExecutionContext<string_type, string_adaptor>& context) const ExecutionContext<string_type, string_adaptor>& context) const
{ {
execute_children(node, context); this->execute_children(node, context);
} // execute } // execute
}; // class Otherwise }; // class Otherwise

2
include/XSLT/impl/xslt_comment.hpp
View file

@ -22,7 +22,7 @@ public:
{ {
context.sink().start_comment(); context.sink().start_comment();
execute_children(node, context); this->execute_children(node, context);
context.sink().end_comment(); context.sink().end_comment();
} // execute } // execute

10
include/XSLT/impl/xslt_copy.hpp
View file

@ -82,13 +82,13 @@ public:
virtual void execute(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const virtual void execute(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const
{ {
copy(node, context); this->copy(node, context);
} // execute } // execute
protected: protected:
virtual void process_content(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const virtual void process_content(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const
{ {
execute_children(node, context); this->execute_children(node, context);
} // process_content } // process_content
private: private:
@ -120,7 +120,7 @@ public:
Arabica::XPath::NodeSet<string_type, string_adaptor> nodes = value.asNodeSet(); Arabica::XPath::NodeSet<string_type, string_adaptor> nodes = value.asNodeSet();
for(typename Arabica::XPath::NodeSet<string_type, string_adaptor>::const_iterator n = nodes.begin(), e = nodes.end(); n != e; ++n) for(typename Arabica::XPath::NodeSet<string_type, string_adaptor>::const_iterator n = nodes.begin(), e = nodes.end(); n != e; ++n)
copy(*n, context); this->copy(*n, context);
} // execute } // execute
protected: protected:
@ -130,11 +130,11 @@ protected:
{ {
const DOM::NamedNodeMap<string_type, string_adaptor>& attrs = node.getAttributes(); const DOM::NamedNodeMap<string_type, string_adaptor>& attrs = node.getAttributes();
for(unsigned int a = 0; a < attrs.getLength(); ++a) for(unsigned int a = 0; a < attrs.getLength(); ++a)
copy(attrs.item(a), context); this->copy(attrs.item(a), context);
} // if ... } // if ...
for(DOM::Node<string_type, string_adaptor> n = node.getFirstChild(); n != 0; n = n.getNextSibling()) for(DOM::Node<string_type, string_adaptor> n = node.getFirstChild(); n != 0; n = n.getNextSibling())
copy(n, context); this->copy(n, context);
} // process_content } // process_content
private: private:

2
include/XSLT/impl/xslt_element.hpp
View file

@ -57,7 +57,7 @@ public:
if(context.sink().start_element(name, namesp)) if(context.sink().start_element(name, namesp))
{ {
ChainStackFrame<string_type, string_adaptor> frame(context); ChainStackFrame<string_type, string_adaptor> frame(context);
execute_children(node, context); this->execute_children(node, context);
context.sink().end_element(name, namesp); context.sink().end_element(name, namesp);
} }
} // execute } // execute

4
include/XSLT/impl/xslt_for_each.hpp
View file

@ -40,14 +40,14 @@ public:
throw SAX::SAXException("xsl:for-each must select a node set"); throw SAX::SAXException("xsl:for-each must select a node set");
NodeSet nodes = sel.asNodeSet(); NodeSet nodes = sel.asNodeSet();
sort(node, nodes, context); this->sort(node, nodes, context);
LastFrame<string_type, string_adaptor> last(context, nodes.size()); LastFrame<string_type, string_adaptor> last(context, nodes.size());
for(size_t n = 0, e = nodes.size(); n != e; ++n) for(size_t n = 0, e = nodes.size(); n != e; ++n)
{ {
ChainStackFrame<string_type, string_adaptor> frame(context); ChainStackFrame<string_type, string_adaptor> frame(context);
context.setPosition(nodes[n], n+1); context.setPosition(nodes[n], n+1);
execute_children(nodes[n], context); this->execute_children(nodes[n], context);
} // for ... } // for ...
} // execute } // execute

4
include/XSLT/impl/xslt_functions.hpp
View file

@ -43,7 +43,7 @@ protected:
{ {
NodeSet nodes; NodeSet nodes;
XPathValue a0 = arg(0, context, executionContext); XPathValue a0 = this->arg(0, context, executionContext);
if(baseT::argCount() != 1) if(baseT::argCount() != 1)
throw Arabica::XPath::UnsupportedException("two arg version of document()"); throw Arabica::XPath::UnsupportedException("two arg version of document()");
if(a0.type() != Arabica::XPath::STRING) if(a0.type() != Arabica::XPath::STRING)
@ -107,7 +107,7 @@ protected:
virtual NodeSet doEvaluate(const DOMNode& context, virtual NodeSet doEvaluate(const DOMNode& context,
const XPathExecutionContext& executionContext) const 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(); string_type keyClarkName = QualifiedName::parseQName(keyname, true, namespaces_).clarkName();
XPathValue a1 = baseT::arg(1, context, executionContext); XPathValue a1 = baseT::arg(1, context, executionContext);

2
include/XSLT/impl/xslt_if.hpp
View file

@ -27,7 +27,7 @@ public:
{ {
ChainStackFrame<string_type, string_adaptor> frame(context); ChainStackFrame<string_type, string_adaptor> frame(context);
if(test_->evaluateAsBool(node, context.xpathContext())) if(test_->evaluateAsBool(node, context.xpathContext()))
execute_children(node, context); this->execute_children(node, context);
} // execute } // execute
private: private:

2
include/XSLT/impl/xslt_inline_element.hpp
View file

@ -76,7 +76,7 @@ public:
a->execute(node, context); a->execute(node, context);
ChainStackFrame<string_type, string_adaptor> frame(context); ChainStackFrame<string_type, string_adaptor> frame(context);
execute_children(node, context); this->execute_children(node, context);
context.sink().end_element(name_, namespace_); context.sink().end_element(name_, namespace_);
} }
} // execute } // execute

2
include/XSLT/impl/xslt_message.hpp
View file

@ -25,7 +25,7 @@ public:
virtual void execute(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const virtual void execute(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const
{ {
RedirectionFrame toMessageSink(context); RedirectionFrame toMessageSink(context);
execute_children(node, context); this->execute_children(node, context);
if(terminate_) if(terminate_)
throw SAX::SAXException("Stylesheet terminated by xsl:message"); throw SAX::SAXException("Stylesheet terminated by xsl:message");

2
include/XSLT/impl/xslt_processing_instruction.hpp
View file

@ -30,7 +30,7 @@ public:
validate_name(name); validate_name(name);
context.sink().start_processing_instruction(name); context.sink().start_processing_instruction(name);
execute_children(node, context); this->execute_children(node, context);
context.sink().end_processing_instruction(); context.sink().end_processing_instruction();
} // execute } // execute

2
include/XSLT/impl/xslt_template.hpp
View file

@ -54,7 +54,7 @@ public:
virtual void execute(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const virtual void execute(const DOM::Node<string_type, string_adaptor>& node, ExecutionContext<string_type, string_adaptor>& context) const
{ {
execute_children(node, context); this->execute_children(node, context);
} // execute } // execute
const MatchExprList& compiled_matches() const { return matches_; } const MatchExprList& compiled_matches() const { return matches_; }

2
include/XSLT/impl/xslt_variable_impl.hpp
View file

@ -43,7 +43,7 @@ public:
if(select_) if(select_)
return select_->evaluate(node, context.xpathContext()); return select_->evaluate(node, context.xpathContext());
execute_children(node, context); this->execute_children(node, context);
if(sink.node() == 0) if(sink.node() == 0)
return StringValue::createValue(string_adaptor::empty_string()); return StringValue::createValue(string_adaptor::empty_string());