You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by db...@apache.org on 2007/04/25 21:41:49 UTC
svn commit: r532455 - /xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
Author: dbertoni
Date: Wed Apr 25 12:41:48 2007
New Revision: 532455
URL: http://svn.apache.org/viewvc?view=rev&rev=532455
Log:
Fix for build errors with local variable "not."
Modified:
xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
Modified: xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp?view=diff&rev=532455&r1=532454&r2=532455
==============================================================================
--- xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp Wed Apr 25 12:41:48 2007
@@ -316,7 +316,7 @@
if(typeInfo && XMLString::equals(typeInfo->getTypeNamespace(), XMLUni::fgInfosetURIName)) {
if(XMLString::equals(typeInfo->getTypeName(), XMLUni::fgNotationString)) {
const XMLCh* notationName=pAttributeNode->getNodeValue();
- DOMNotation* not=(DOMNotation*)includedDoc->getDoctype()->getNotations()->getNamedItem(notationName);
+ DOMNotation* notat=(DOMNotation*)includedDoc->getDoctype()->getNotations()->getNamedItem(notationName);
// ensure we have a DTD
if(parsedDocument->getDoctype()==NULL)
parsedDocument->insertBefore(parsedDocument->createDocumentType(parsedDocument->getDocumentElement()->getNodeName(), NULL,NULL), parsedDocument->getFirstChild());
@@ -324,11 +324,11 @@
if(myNotation==NULL)
{
// it's missing, add it
- parsedDocument->getDoctype()->getNotations()->setNamedItem(parsedDocument->importNode(not, true));
+ parsedDocument->getDoctype()->getNotations()->setNamedItem(parsedDocument->importNode(notat, true));
}
- else if(XMLString::equals(myNotation->getPublicId(), not->getPublicId()) &&
- XMLString::equals(myNotation->getSystemId(), not->getSystemId()) &&
- XMLString::equals(myNotation->getBaseURI(), not->getBaseURI()))
+ else if(XMLString::equals(myNotation->getPublicId(), notat->getPublicId()) &&
+ XMLString::equals(myNotation->getSystemId(), notat->getSystemId()) &&
+ XMLString::equals(myNotation->getBaseURI(), notat->getBaseURI()))
{
// it's duplicate, ignore it
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org