[mapguide-commits] r9460 - trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-01-15 04:53:15 -0800 (Tue, 15 Jan 2019)
New Revision: 9460

Modified:
   trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp
   trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp
Log:
#2791: Apply patches from https://sourceforge.net/p/xqilla/bugs/48/ to get it to build on Ubuntu 18.04, whose system version of Xerces is 3.2.0

Modified: trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp	2019-01-15 09:01:28 UTC (rev 9459)
+++ trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp	2019-01-15 12:53:15 UTC (rev 9460)
@@ -64,7 +64,11 @@
     if (thisNodeImpl->isReadOnly())
         throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, getMemoryManager());
 
+#if _XERCES_VERSION >= 30200
+    DOMNode* thisNode = fParent.fContainingNode;
+#else
     DOMNode* thisNode = castToNode(&fParent);
+#endif
     if (newChild->getOwnerDocument() != thisNode)
         throw DOMException(DOMException::WRONG_DOCUMENT_ERR, 0, getMemoryManager());
 

Modified: trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp	2019-01-15 09:01:28 UTC (rev 9459)
+++ trunk/MgDev/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp	2019-01-15 12:53:15 UTC (rev 9460)
@@ -35,7 +35,11 @@
 
 XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix, 
 		const XMLCh* const nsUri, DOMElement *owner, DOMDocument *docOwner) 
-	: fNode(docOwner)
+#if _XERCES_VERSION >= 30200
+    : fNode(this, docOwner)
+#else
+    : fNode(docOwner)
+#endif
 {
     DOMNodeImpl *argImpl = castToNodeImpl(this);
 
@@ -56,7 +60,12 @@
 }
 
 XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other) 
-	: fNode(other.fNode), uri(other.uri), prefix(other.prefix)
+#if _XERCES_VERSION >= 30200
+    : fNode(this, other.fNode), 
+#else
+    : fNode(other.fNode), 
+#endif
+      uri(other.uri), prefix(other.prefix)
 {
 }
 
@@ -198,7 +207,11 @@
 
     //if it is a custom node and bigger than us we must ask it for the order
     if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) {
+#if _XERCES_VERSION >= 30200
+        DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0);
+#else
         DOMNodeImpl tmp(0);
+#endif
 #if _XERCES_VERSION >= 30000
         return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this));
 #else