You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/07/03 21:18:08 UTC
cvs commit: xml-xerces/c/src/parsers DOMParser.cpp
tng 01/07/03 12:18:06
Modified: c/src/dom XMLDeclImpl.cpp
c/src/parsers DOMParser.cpp
Log:
Some compilers (e.g. the HP compiler) has mistaken the parameter 'std', which is short for standalone as
the special prefix used by the standard libraries. By Dean Roddey.
Revision Changes Path
1.4 +16 -16 xml-xerces/c/src/dom/XMLDeclImpl.cpp
Index: XMLDeclImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/XMLDeclImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDeclImpl.cpp 2000/05/02 19:22:02 1.3
+++ XMLDeclImpl.cpp 2001/07/03 19:17:55 1.4
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLDeclImpl.cpp,v 1.3 2000/05/02 19:22:02 aruna1 Exp $
+ * $Id: XMLDeclImpl.cpp,v 1.4 2001/07/03 19:17:55 tng Exp $
*/
#include "XMLDeclImpl.hpp"
@@ -65,7 +65,7 @@
#include "DocumentImpl.hpp"
-XMLDeclImpl::XMLDeclImpl(DocumentImpl *ownerDoc)
+XMLDeclImpl::XMLDeclImpl(DocumentImpl *ownerDoc)
: ChildNode(ownerDoc),
version(DOMString(XMLUni::fgSupportedVersion)),
encoding (DOMString(XMLUni::fgUTF8EncodingString)),
@@ -76,11 +76,11 @@
//Introduced in DOM Level 2
XMLDeclImpl::XMLDeclImpl(DocumentImpl *ownerDoc, const DOMString &ver,
- const DOMString &enc, const DOMString &std)
+ const DOMString &enc, const DOMString &isStd)
: ChildNode(ownerDoc),
version ( ver.clone() ),
encoding ( enc.clone() ),
- standalone ( std.clone() )
+ standalone ( isStd.clone() )
{
};
1.54 +3 -3 xml-xerces/c/src/parsers/DOMParser.cpp
Index: DOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/DOMParser.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- DOMParser.cpp 2001/06/13 16:42:33 1.53
+++ DOMParser.cpp 2001/07/03 19:18:02 1.54
@@ -59,7 +59,7 @@
* handler with the scanner. In these handler methods, appropriate DOM nodes
* are created and added to the DOM tree.
*
-* $Id: DOMParser.cpp,v 1.53 2001/06/13 16:42:33 tng Exp $
+* $Id: DOMParser.cpp,v 1.54 2001/07/03 19:18:02 tng Exp $
*
*/
@@ -721,8 +721,8 @@
DOMString ver(version);
DOMString enc(encoding);
- DOMString std(standalone);
- DOM_XMLDecl xmlDecl = fDocument.createXMLDecl(ver, enc, std);
+ DOMString isStd(standalone);
+ DOM_XMLDecl xmlDecl = fDocument.createXMLDecl(ver, enc, isStd);
fCurrentParent.appendChild(xmlDecl);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org