You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ar...@locus.apache.org on 2000/01/06 20:43:26 UTC

cvs commit: xml-xerces/c/src/dom NodeImpl.cpp NamedNodeMapImpl.cpp

aruna1      00/01/06 11:43:26

  Modified:    c/src/dom NodeImpl.cpp NamedNodeMapImpl.cpp
  Log:
  Modifed ?: consturct on solaris to assign DOMString objects
  
  Revision  Changes    Path
  1.5       +4 -1      xml-xerces/c/src/dom/NodeImpl.cpp
  
  Index: NodeImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/dom/NodeImpl.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NodeImpl.cpp	2000/01/05 01:16:08	1.4
  +++ NodeImpl.cpp	2000/01/06 19:43:25	1.5
  @@ -56,6 +56,9 @@
   
   /**
   * $Log: NodeImpl.cpp,v $
  +* Revision 1.5  2000/01/06 19:43:25  aruna1
  +* Modifed ?: consturct on solaris to assign DOMString objects
  +*
   * Revision 1.4  2000/01/05 01:16:08  andyh
   * DOM Level 2 core, namespace support added.
   *
  @@ -150,7 +153,7 @@
       }
   
       const DOMString& URI = mapPrefix(prefix, namespaceURI, nTyp);
  -    this -> namespaceURI = URI == null ? null : URI.clone();
  +    this -> namespaceURI = URI == null ? DOMString(null) : URI.clone();
   
       this->nType=nTyp;
       this->isLeafNode=isLeafNod;
  
  
  
  1.4       +11 -6     xml-xerces/c/src/dom/NamedNodeMapImpl.cpp
  
  Index: NamedNodeMapImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/dom/NamedNodeMapImpl.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamedNodeMapImpl.cpp	2000/01/05 01:16:08	1.3
  +++ NamedNodeMapImpl.cpp	2000/01/06 19:43:25	1.4
  @@ -56,6 +56,9 @@
   
   /**
    * $Log: NamedNodeMapImpl.cpp,v $
  + * Revision 1.4  2000/01/06 19:43:25  aruna1
  + * Modifed ?: consturct on solaris to assign DOMString objects
  + *
    * Revision 1.3  2000/01/05 01:16:08  andyh
    * DOM Level 2 core, namespace support added.
    *
  @@ -334,9 +337,11 @@
   	    if (n->isAttrImpl() && d->isAttrImpl()) {	//DOM Level 2
   		d = d->cloneNode(true); //copy d and ownerElement of n
   		((AttrImpl *) d)->setOwnerElement(((AttrImpl *) n)->getOwnerElement());
  -		d->namespaceURI = n->namespaceURI == null ? null : n->namespaceURI.clone();
  -		d->prefix = n->prefix == null ? null : n->prefix.clone();
  -		d->localName = n->localName == null ? null : n->localName.clone();
  +
  +		d->namespaceURI = (n->namespaceURI == null) ? DOMString(null) : n->namespaceURI.clone();
  +		d->prefix = (n->prefix == null) ? DOMString(null) : n->prefix.clone();
  +		d->localName = (n->localName == null) ? DOMString(null) : n->localName.clone();
  +
   	    }
               nodes->setElementAt(d, i);
   	} else
  @@ -557,9 +562,9 @@
   	if (n->isAttrImpl() && d->isAttrImpl()) {
   	    d = d->cloneNode(true); //copy d and ownerElement of n
   	    ((AttrImpl *) d)->setOwnerElement(((AttrImpl *) n)->getOwnerElement());
  -	    d->namespaceURI = n->namespaceURI == null ? null : n->namespaceURI.clone();
  -	    d->prefix = n->prefix == null ? null : n->prefix.clone();
  -	    d->localName = n->localName == null ? null : n->localName.clone();
  +	    d->namespaceURI = (n->namespaceURI == null) ? DOMString(null) : n->namespaceURI.clone();
  +	    d->prefix = n->prefix == null ? DOMString(null) : n->prefix.clone();
  +	    d->localName = n->localName == null ? DOMString(null) : n->localName.clone();
   	}
           nodes -> setElementAt(d, i);	//replace n in nodes by d
       } else