From dbc4dc8816b30c1f37c9fc5d8f3d5786df1b3981 Mon Sep 17 00:00:00 2001
From: Tinny Ng <tng@apache.org>
Date: Tue, 3 Jul 2001 19:18:02 +0000
Subject: [PATCH] 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.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@172834 13f79535-47bb-0310-9956-ffa450edef68
---
src/dom/XMLDeclImpl.cpp | 30 +++++++++++++++---------------
src/parsers/DOMParser.cpp | 4 ++--
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/dom/XMLDeclImpl.cpp b/src/dom/XMLDeclImpl.cpp
index 6f7d8d067..568bcff88 100644
--- a/src/dom/XMLDeclImpl.cpp
+++ b/src/dom/XMLDeclImpl.cpp
@@ -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
@@ -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 @@ XMLDeclImpl::XMLDeclImpl(DocumentImpl *ownerDoc)
//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() )
{
};
diff --git a/src/parsers/DOMParser.cpp b/src/parsers/DOMParser.cpp
index c8852b011..bdddd2212 100644
--- a/src/parsers/DOMParser.cpp
+++ b/src/parsers/DOMParser.cpp
@@ -721,8 +721,8 @@ void DOMParser::XMLDecl(const XMLCh* const version
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);
}
--
GitLab