]>
Commit | Line | Data |
---|---|---|
5beb1686 JB |
1 | --- src/dom-api/impl/XPathNamespaceImpl.cpp.orig 2017-09-03 20:26:37 UTC |
2 | +++ src/dom-api/impl/XPathNamespaceImpl.cpp | |
3 | @@ -33,7 +33,11 @@ XERCES_CPP_NAMESPACE_USE; | |
4 | ||
5 | XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix, | |
6 | const XMLCh* const nsUri, DOMElement *owner, DOMDocument *docOwner) | |
7 | +#if _XERCES_VERSION >= 30200 | |
8 | + : fNode(this, docOwner) | |
9 | +#else | |
10 | : fNode(docOwner) | |
11 | +#endif | |
12 | { | |
13 | DOMNodeImpl *argImpl = castToNodeImpl(this); | |
14 | ||
15 | @@ -54,7 +58,13 @@ XPathNamespaceImpl::XPathNamespaceImpl(c | |
16 | } | |
17 | ||
18 | XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other) | |
19 | - : fNode(other.fNode), uri(other.uri), prefix(other.prefix) | |
20 | +#if _XERCES_VERSION >= 30200 | |
21 | + : fNode(this, other.fNode), | |
22 | +#else | |
23 | + : fNode(other.fNode), | |
24 | + | |
25 | +#endif | |
26 | + uri(other.uri), prefix(other.prefix) | |
27 | { | |
28 | } | |
29 | ||
30 | @@ -196,7 +206,11 @@ short XPathNamespaceImpl::com | |
31 | ||
32 | //if it is a custom node and bigger than us we must ask it for the order | |
33 | if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) { | |
34 | +#if _XERCES_VERSION >= 30200 | |
35 | + DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0); | |
36 | +#else | |
37 | DOMNodeImpl tmp(0); | |
38 | +#endif | |
39 | #if _XERCES_VERSION >= 30000 | |
40 | return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this)); | |
41 | #else |