ifdef fix to workaround pathscale bug for DOM

(pathscale doesn't let you use associated() in a restricted expression)
libAtoms · Dec 22, 2007 · f974dd5 · f974dd5
1 parent ee3dff8
commit f974dd5
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 11,676 deletions.
diff --git a/dom/m_dom_attribute.m4 b/dom/m_dom_attribute.m4
@@ -35,7 +35,11 @@ TOHW_m_dom_get(Node, ownerElement, np%elExtras%ownerElement, (ATTRIBUTE_NODE))
 
   TOHW_function(getValue_DOM, (arg), c)
     type(Node), pointer :: arg
+#ifdef RESTRICTED_ASSOCIATED_BUG
+    character(len=getTextContent_len(arg, .true.)) :: c 
+#else
     character(len=getTextContent_len(arg, associated(arg))) :: c 
+#endif
 
     if (.not.associated(arg)) then
       TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)

diff --git a/dom/m_dom_document.m4 b/dom/m_dom_document.m4
@@ -923,7 +923,11 @@ TOHW_m_dom_set(logical, xmlStandalone, np%docExtras%xds%standalone, (DOCUMENT_NO
 
   TOHW_function(getXmlEncoding, (arg), s)
     type(Node), pointer :: arg
+#ifdef RESTRICTED_ASSOCIATED_BUG
+    character(len=getXmlEncoding_len(arg, .true.)) :: s
+#else
     character(len=getXmlEncoding_len(arg, associated(arg))) :: s
+#endif
 
     if (.not.associated(arg)) then
       TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)
@@ -952,7 +956,11 @@ TOHW_m_dom_set(logical, xmlStandalone, np%docExtras%xds%standalone, (DOCUMENT_NO
 
   TOHW_function(getInputEncoding, (arg), s)
     type(Node), pointer :: arg
+#ifdef RESTRICTED_ASSOCIATED_BUG
+    character(len=getInputEncoding_len(arg, .true.)) :: s
+#else
     character(len=getInputEncoding_len(arg, associated(arg))) :: s
+#endif
 
     if (.not.associated(arg)) then
       TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)