Author: zongaro
Date: Thu Nov 26 16:55:07 2009
New Revision: 884640
URL: http://svn.apache.org/viewvc?rev=884640&view=rev
Log:
Applying patch for bug XALANJ-2495 from Martin von Gagern which corrects a
mistranslation of two messages to German. I don't speak or read German, so I'm
taking it on faith that the new message text improves upon the old.
Modified:
xalan/java/trunk/src/org/apache/xalan/res/XSLTErrorResources_de.java
Modified: xalan/java/trunk/src/org/apache/xalan/res/XSLTErrorResources_de.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/res/XSLTErrorResources_de.java?rev=884640&r1=884639&r2=884640&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/res/XSLTErrorResources_de.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/res/XSLTErrorResources_de.java Thu Nov 26 16:55:07
2009
@@ -911,7 +911,7 @@
"Elementinhalt nicht zul\u00e4ssig f\u00fcr lang=javaclass {0}."},
{ ER_STYLESHEET_DIRECTED_TERMINATION,
- "Formatvorlage hat die Beendigung \u00fcbertragen."},
+ "Formatvorlage hat die Beendigung ausgel\u00f6st."},
{ ER_ONE_OR_TWO,
"1 oder 2"},
@@ -1252,7 +1252,7 @@
"URL konnte nicht erstellt werden aus: {0}"},
{ WG_CANNOT_LOAD_REQUESTED_DOC,
- "Angeforderte Dokumentation kann nicht geladen werden: {0}"},
+ "Angefordertes Dokument kann nicht geladen werden: {0}"},
{ WG_CANNOT_FIND_COLLATOR,
"Collator f\u00fcr <sort xml:lang={0} konnte nicht gefunden werden."},
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: zongaro
Date: Wed Nov 25 21:55:09 2009
New Revision: 884287
URL: http://svn.apache.org/viewvc?rev=884287&view=rev
Log:
Applying patch contributed by Martin von Gagern for XALANJ-2493 and XALANJ-2424.
Quoting from Martin, "The current implementation of nodeList2Iterator is
broken, because it can not deal with attribute nodes. It relies on copyNodes
which in turn tries to add attribute nodes as children of some top level node.
Attributes don't live on the children axis, though, so this is against DOM and
causes a DOM exception in the Xerces DOM implementation and probably most other
implementations. The resulting HIERARCHY_REQUEST_ERR was noted e.g. in
XALANJ-2424. Furthermore, the implementation is inefficient, because it
manually copies each and every node from the source document to a new DTM to
some new DTM....
I dropped copyNodes in favor of Document.importNode, to avoid code duplication
and rely on supposedly more heavily tested code. I also added another level of
elements, so that there is one such dummy node for every item of the source
list, with always a single child or element. A few assertions help ensure this
single child policy. This is especially important in the new implementation,
because otherwise it would become difficult to get the proxied nodes and the
newly DTMified nodes into correct order.
Added:
xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java (with props)
xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java (with
props)
Modified:
xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
Added: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java?rev=884287&view=auto
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java (added)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java Wed Nov 25
21:55:09 2009
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * $Id$
+ */
+
+package org.apache.xalan.xsltc.dom;
+
+import org.apache.xml.dtm.DTMAxisIterator;
+
+public class ArrayNodeListIterator implements DTMAxisIterator {
+
+ private int _pos = 0;
+
+ private int _mark = 0;
+
+ private int _nodes[];
+
+ private static final int[] EMPTY = { };
+
+ public ArrayNodeListIterator(int[] nodes) {
+ _nodes = nodes;
+ }
+
+ public int next() {
+ return _pos < _nodes.length ? _nodes[_pos++] : END;
+ }
+
+ public DTMAxisIterator reset() {
+ _pos = 0;
+ return this;
+ }
+
+ public int getLast() {
+ return _nodes.length;
+ }
+
+ public int getPosition() {
+ return _pos;
+ }
+
+ public void setMark() {
+ _mark = _pos;
+ }
+
+ public void gotoMark() {
+ _pos = _mark;
+ }
+
+ public DTMAxisIterator setStartNode(int node) {
+ if (node == END) _nodes = EMPTY;
+ return this;
+ }
+
+ public int getStartNode() {
+ return END;
+ }
+
+ public boolean isReverse() {
+ return false;
+ }
+
+ public DTMAxisIterator cloneIterator() {
+ return new ArrayNodeListIterator(_nodes);
+ }
+
+ public void setRestartable(boolean isRestartable) {
+ }
+
+ public int getNodeByPosition(int position) {
+ return _nodes[position - 1];
+ }
+
+}
Propchange: xalan/java/trunk/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java
------------------------------------------------------------------------------
svn:executable = *
Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java?rev=884287&r1=884286&r2=884287&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java Wed Nov 25 21:55:09
2009
@@ -38,12 +38,17 @@
import org.apache.xalan.xsltc.dom.MultiDOM;
import org.apache.xalan.xsltc.dom.SingletonIterator;
import org.apache.xalan.xsltc.dom.StepIterator;
+import org.apache.xalan.xsltc.dom.ArrayNodeListIterator;
+import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.DTMManager;
import org.apache.xml.dtm.ref.DTMDefaultBase;
+import org.apache.xml.dtm.ref.DTMNodeProxy;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import org.apache.xml.serializer.NamespaceMappings;
@@ -1097,90 +1102,42 @@
}
/**
- * Utility function used to copy a node list to be under a parent node.
+ * In a perfect world, this would be the implementation for
+ * nodeList2Iterator. In reality, though, this causes a
+ * ClassCastException in getDTMHandleFromNode because SAXImpl is
+ * not an instance of DOM2DTM. So we use the more lengthy
+ * implementation below until this issue has been addressed.
+ *
+ * @see org.apache.xml.dtm.ref.DTMManagerDefault#getDTMHandleFromNode
*/
- private static void copyNodes(org.w3c.dom.NodeList nodeList,
- org.w3c.dom.Document doc, org.w3c.dom.Node parent)
+ private static DTMAxisIterator nodeList2IteratorUsingHandleFromNode(
+ org.w3c.dom.NodeList nodeList,
+ Translet translet, DOM dom)
{
- final int size = nodeList.getLength();
-
- // copy Nodes from NodeList into new w3c DOM
- for (int i = 0; i < size; i++)
- {
- org.w3c.dom.Node curr = nodeList.item(i);
- int nodeType = curr.getNodeType();
- String value = null;
- try {
- value = curr.getNodeValue();
- } catch (DOMException ex) {
- runTimeError(RUN_TIME_INTERNAL_ERR, ex.getMessage());
- return;
- }
-
- String nodeName = curr.getNodeName();
- org.w3c.dom.Node newNode = null;
- switch (nodeType){
- case org.w3c.dom.Node.ATTRIBUTE_NODE:
- newNode = doc.createAttributeNS(curr.getNamespaceURI(),
- nodeName);
- break;
- case org.w3c.dom.Node.CDATA_SECTION_NODE:
- newNode = doc.createCDATASection(value);
- break;
- case org.w3c.dom.Node.COMMENT_NODE:
- newNode = doc.createComment(value);
- break;
- case org.w3c.dom.Node.DOCUMENT_FRAGMENT_NODE:
- newNode = doc.createDocumentFragment();
- break;
- case org.w3c.dom.Node.DOCUMENT_NODE:
- newNode = doc.createElementNS(null, "__document__");
- copyNodes(curr.getChildNodes(), doc, newNode);
- break;
- case org.w3c.dom.Node.DOCUMENT_TYPE_NODE:
- // nothing?
- break;
- case org.w3c.dom.Node.ELEMENT_NODE:
- // For Element node, also copy the children and the
- // attributes.
- org.w3c.dom.Element element = doc.createElementNS(
- curr.getNamespaceURI(), nodeName);
- if (curr.hasAttributes())
- {
- org.w3c.dom.NamedNodeMap attributes = curr.getAttributes();
- for (int k = 0; k < attributes.getLength(); k++) {
- org.w3c.dom.Node attr = attributes.item(k);
- element.setAttributeNS(attr.getNamespaceURI(),
- attr.getNodeName(), attr.getNodeValue());
- }
- }
- copyNodes(curr.getChildNodes(), doc, element);
- newNode = element;
- break;
- case org.w3c.dom.Node.ENTITY_NODE:
- // nothing ?
- break;
- case org.w3c.dom.Node.ENTITY_REFERENCE_NODE:
- newNode = doc.createEntityReference(nodeName);
- break;
- case org.w3c.dom.Node.NOTATION_NODE:
- // nothing ?
- break;
- case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:
- newNode = doc.createProcessingInstruction(nodeName,
- value);
- break;
- case org.w3c.dom.Node.TEXT_NODE:
- newNode = doc.createTextNode(value);
- break;
- }
- try {
- parent.appendChild(newNode);
- } catch (DOMException e) {
- runTimeError(RUN_TIME_INTERNAL_ERR, e.getMessage());
- return;
- }
- }
+ final int n = nodeList.getLength();
+ final int[] dtmHandles = new int[n];
+ DTMManager dtmManager = null;
+ if (dom instanceof MultiDOM)
+ dtmManager = ((MultiDOM) dom).getDTMManager();
+ for (int i = 0; i < n; ++i) {
+ org.w3c.dom.Node node = nodeList.item(i);
+ int handle;
+ if (dtmManager != null) {
+ handle = dtmManager.getDTMHandleFromNode(node);
+ }
+ else if (node instanceof DTMNodeProxy
+ && ((DTMNodeProxy) node).getDTM() == dom) {
+ handle = ((DTMNodeProxy) node).getDTMNodeNumber();
+ }
+ else {
+ runTimeError(RUN_TIME_INTERNAL_ERR, "need MultiDOM");
+ return null;
+ }
+ dtmHandles[i] = handle;
+ System.out.println("Node " + i + " has handle 0x" +
+ Integer.toString(handle, 16));
+ }
+ return new ArrayNodeListIterator(dtmHandles);
}
/**
@@ -1191,26 +1148,93 @@
org.w3c.dom.NodeList nodeList,
Translet translet, DOM dom)
{
- // w3c NodeList -> w3c DOM
+ // First pass: build w3c DOM for all nodes not proxied from our DOM.
+ //
+ // Notice: this looses some (esp. parent) context for these nodes,
+ // so some way to wrap the original nodes inside a DTMAxisIterator
+ // might be preferable in the long run.
+ int n = 0; // allow for change in list length, just in case.
Document doc = null;
- try {
- doc = ((AbstractTranslet) translet).newDocument("", "__top__");
- }
- catch (javax.xml.parsers.ParserConfigurationException e) {
- runTimeError(RUN_TIME_INTERNAL_ERR, e.getMessage());
- return null;
+ DTMManager dtmManager = null;
+ int[] proxyNodes = new int[nodeList.getLength()];
+ if (dom instanceof MultiDOM)
+ dtmManager = ((MultiDOM) dom).getDTMManager();
+ for (int i = 0; i < nodeList.getLength(); ++i) {
+ org.w3c.dom.Node node = nodeList.item(i);
+ if (node instanceof DTMNodeProxy) {
+ DTMNodeProxy proxy = (DTMNodeProxy)node;
+ DTM nodeDTM = proxy.getDTM();
+ int handle = proxy.getDTMNodeNumber();
+ boolean isOurDOM = (nodeDTM == dom);
+ if (!isOurDOM && dtmManager != null) {
+ try {
+ isOurDOM = (nodeDTM == dtmManager.getDTM(handle));
+ }
+ catch (ArrayIndexOutOfBoundsException e) {
+ // invalid node handle, so definitely not our doc
+ }
+ }
+ if (isOurDOM) {
+ proxyNodes[i] = handle;
+ ++n;
+ continue;
+ }
+ }
+ proxyNodes[i] = DTM.NULL;
+ int nodeType = node.getNodeType();
+ if (doc == null) {
+ if (dom instanceof MultiDOM == false) {
+ runTimeError(RUN_TIME_INTERNAL_ERR, "need MultiDOM");
+ return null;
+ }
+ try {
+ AbstractTranslet at = (AbstractTranslet) translet;
+ doc = at.newDocument("", "__top__");
+ }
+ catch (javax.xml.parsers.ParserConfigurationException e) {
+ runTimeError(RUN_TIME_INTERNAL_ERR, e.getMessage());
+ return null;
+ }
+ }
+ // Use one dummy element as container for each node of the
+ // list. That way, it is easier to detect resp. avoid
+ // funny things which change the number of nodes,
+ // e.g. auto-concatenation of text nodes.
+ Element mid;
+ switch (nodeType) {
+ case org.w3c.dom.Node.ELEMENT_NODE:
+ case org.w3c.dom.Node.TEXT_NODE:
+ case org.w3c.dom.Node.CDATA_SECTION_NODE:
+ case org.w3c.dom.Node.COMMENT_NODE:
+ case org.w3c.dom.Node.ENTITY_REFERENCE_NODE:
+ case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:
+ mid = doc.createElementNS(null, "__dummy__");
+ mid.appendChild(doc.importNode(node, true));
+ doc.getDocumentElement().appendChild(mid);
+ ++n;
+ break;
+ case org.w3c.dom.Node.ATTRIBUTE_NODE:
+ // The mid element also serves as a container for
+ // attributes, avoiding problems with conflicting
+ // attributes or node order.
+ mid = doc.createElementNS(null, "__dummy__");
+ mid.setAttributeNodeNS((Attr)doc.importNode(node, true));
+ doc.getDocumentElement().appendChild(mid);
+ ++n;
+ break;
+ default:
+ // Better play it safe for all types we aren't sure we know
+ // how to deal with.
+ runTimeError(RUN_TIME_INTERNAL_ERR,
+ "Don't know how to convert node type "
+ + nodeType);
+ }
}
-
- // Copy all the nodes in the nodelist to be under the top element
- copyNodes(nodeList, doc, doc.getDocumentElement());
// w3cDOM -> DTM -> DOMImpl
- if (dom instanceof MultiDOM) {
- final MultiDOM multiDOM = (MultiDOM) dom;
-
- DTMDefaultBase dtm = (DTMDefaultBase)((DOMAdapter)multiDOM.getMain()).getDOMImpl();
- DTMManager dtmManager = dtm.getManager();
-
+ DTMAxisIterator iter = null, childIter = null, attrIter = null;
+ if (doc != null) {
+ final MultiDOM multiDOM = (MultiDOM) dom;
DOM idom = (DOM)dtmManager.getDTM(new DOMSource(doc), false,
null, true, false);
// Create DOMAdapter and register with MultiDOM
@@ -1223,16 +1247,57 @@
DTMAxisIterator iter1 = idom.getAxisIterator(Axis.CHILD);
DTMAxisIterator iter2 = idom.getAxisIterator(Axis.CHILD);
- DTMAxisIterator iter = new AbsoluteIterator(
+ iter = new AbsoluteIterator(
new StepIterator(iter1, iter2));
iter.setStartNode(DTMDefaultBase.ROOTNODE);
- return iter;
+
+ childIter = idom.getAxisIterator(Axis.CHILD);
+ attrIter = idom.getAxisIterator(Axis.ATTRIBUTE);
}
- else {
- runTimeError(RUN_TIME_INTERNAL_ERR, "nodeList2Iterator()");
- return null;
- }
+
+ // Second pass: find DTM handles for every node in the list.
+ int[] dtmHandles = new int[n];
+ n = 0;
+ for (int i = 0; i < nodeList.getLength(); ++i) {
+ if (proxyNodes[i] != DTM.NULL) {
+ dtmHandles[n++] = proxyNodes[i];
+ continue;
+ }
+ org.w3c.dom.Node node = nodeList.item(i);
+ DTMAxisIterator iter3 = null;
+ int nodeType = node.getNodeType();
+ switch (nodeType) {
+ case org.w3c.dom.Node.ELEMENT_NODE:
+ case org.w3c.dom.Node.TEXT_NODE:
+ case org.w3c.dom.Node.CDATA_SECTION_NODE:
+ case org.w3c.dom.Node.COMMENT_NODE:
+ case org.w3c.dom.Node.ENTITY_REFERENCE_NODE:
+ case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:
+ iter3 = childIter;
+ break;
+ case org.w3c.dom.Node.ATTRIBUTE_NODE:
+ iter3 = attrIter;
+ break;
+ default:
+ // Should not happen, as first run should have got all these
+ throw new InternalRuntimeError("Mismatched cases");
+ }
+ if (iter3 != null) {
+ iter3.setStartNode(iter.next());
+ dtmHandles[n] = iter3.next();
+ // For now, play it self and perform extra checks:
+ if (dtmHandles[n] == DTMAxisIterator.END)
+ throw new InternalRuntimeError("Expected element missing at " + i);
+ if (iter3.next() != DTMAxisIterator.END)
+ throw new InternalRuntimeError("Too many elements at " + i);
+ ++n;
+ }
+ }
+ if (n != dtmHandles.length)
+ throw new InternalRuntimeError("Nodes lost in second pass");
+
+ return new ArrayNodeListIterator(dtmHandles);
}
/**
Added: xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java?rev=884287&view=auto
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java (added)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java Wed Nov
25 21:55:09 2009
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * $Id$
+ */
+
+package org.apache.xalan.xsltc.runtime;
+
+/**
+ * Class to express failed assertions and similar for the xsltc runtime.
+ * As java.lang.AssertionError was introduced in JDK 1.4 we can't use that yet.
+ */
+public class InternalRuntimeError extends Error {
+
+ public InternalRuntimeError(String message) {
+ super(message);
+ }
+
+}
Propchange: xalan/java/trunk/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Thu Jun 18 21:39:49 2009
New Revision: 786300
URL: http://svn.apache.org/viewvc?rev=786300&view=rev
Log:
Fix for XALANC-692.
Modified:
xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp
Modified: xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp?rev=786300&r1=786299&r2=786300&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp (original)
+++ xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp Thu Jun 18 21:39:49 2009
@@ -144,7 +144,7 @@
// Get the rest of the arguments in any order.
for (int i = 2; i < argc && fSuccess == true; ++i)
{
- if(!stricmp("-out", argv[i]))
+ if(!strcmp("-out", argv[i]))
{
++i;
if(i < argc && argv[i][0] != '-')
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Apr 6 15:53:08 2009
New Revision: 762403
URL: http://svn.apache.org/viewvc?rev=762403&view=rev
Log:
Fixes for XALANC-690.
Modified:
xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
Modified: xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf?rev=762403&r1=762402&r2=762403&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf (original)
+++ xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf Mon Apr 6 15:53:08 2009
@@ -720,8 +720,8 @@
</trans-unit>
<trans-unit id="CantFindFragment_1Param">
- <source>Could not find the fragment '{0}'</source>
- <target>Could not find the fragment '{0}'</target>
+ <source>The fragment '{0}' was not found.</source>
+ <target>The fragment '{0}' was not found.</target>
</trans-unit>
<trans-unit id="NodePointedByFragment_1Param">
@@ -1038,6 +1038,11 @@
<target>The processor cannot use the HTML output method because the current
extension output method does not support it.</target>
</trans-unit>
+<trans-unit id="CannotFindFragment_2Param">
+ <source>The fragment '{0}' was not found in the document '{1}'.</source>
+ <target>The fragment '{0}' was not found in the document '{1}'.</target>
+</trans-unit>
+
</body>
</file>
</xliff>
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp?rev=762403&r1=762402&r2=762403&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp Mon Apr 6 15:53:08 2009
@@ -86,7 +86,35 @@
base);
executionContext.problem(
- XPathExecutionContext::eXPath,
+ XPathExecutionContext::eXSLTProcessor,
+ XPathExecutionContext::eWarning,
+ theMessage,
+ locator,
+ sourceNode);
+}
+
+
+
+inline void
+doWarnFragID(
+ XPathExecutionContext& executionContext,
+ const XalanDOMString& uri,
+ const XalanDOMString& fragID,
+ const XalanNode* sourceNode,
+ const Locator* locator)
+{
+ const GetCachedString theGuard(executionContext);
+
+ XalanDOMString& theMessage = theGuard.get();
+
+ XalanMessageLoader::getMessage(
+ theMessage,
+ XalanMessages::CannotFindFragment_2Param,
+ uri,
+ fragID);
+
+ executionContext.problem(
+ XPathExecutionContext::eXSLTProcessor,
XPathExecutionContext::eWarning,
theMessage,
locator,
@@ -207,13 +235,32 @@
const XalanNode* sourceNode,
const Locator* locator)
{
- XalanDocument* newDoc = executionContext.getSourceDocument(uri);
+ const XalanDOMString::size_type fragIndex =
+ indexOf(uri, XalanUnicode::charNumberSign);
+
+ const GetCachedString theGuard1(executionContext);
+ const GetCachedString theGuard2(executionContext);
+
+ XalanDOMString& newURI = theGuard1.get();
+ XalanDOMString& fragID = theGuard2.get();
+
+ if (fragIndex == uri.length())
+ {
+ newURI = uri;
+ }
+ else
+ {
+ substring(uri, newURI, 0, fragIndex);
+ substring(uri, fragID, fragIndex + 1);
+ }
+
+ XalanDocument* newDoc = executionContext.getSourceDocument(newURI);
if (newDoc == 0)
{
- if (uri.length() != 0)
+ if (newURI.length() != 0)
{
- newDoc = parseDoc(executionContext, uri, base, sourceNode, locator);
+ newDoc = parseDoc(executionContext, newURI, base, sourceNode, locator);
}
else
{
@@ -231,7 +278,23 @@
if (newDoc != 0)
{
- mnl->addNodeInDocOrder(newDoc, executionContext);
+ if (fragID.length() == 0)
+ {
+ mnl->addNodeInDocOrder(newDoc, executionContext);
+ }
+ else
+ {
+ XalanNode* const theNode = newDoc->getElementById(fragID);
+
+ if (theNode != 0)
+ {
+ mnl->addNodeInDocOrder(theNode, executionContext);
+ }
+ else
+ {
+ doWarnFragID(executionContext, fragID, newURI, sourceNode, locator);
+ }
+ }
}
}
@@ -331,7 +394,7 @@
const GetCachedString theGuard1(executionContext);
executionContext.problem(
- XPathExecutionContext::eXPath,
+ XPathExecutionContext::eXSLTProcessor,
XPathExecutionContext::eError,
XalanMessageLoader::getMessage(
theGuard1.get(),
@@ -349,7 +412,7 @@
const GetCachedString theGuard1(executionContext);
executionContext.problem(
- XPathExecutionContext::eXPath,
+ XPathExecutionContext::eXSLTProcessor,
XPathExecutionContext::eError,
XalanMessageLoader::getMessage(
theGuard1.get(),
@@ -481,7 +544,7 @@
const GetCachedString theGuard(executionContext);
executionContext.problem(
- XPathExecutionContext::eXPath,
+ XPathExecutionContext::eXSLTProcessor,
XPathExecutionContext::eWarning,
XalanMessageLoader::getMessage(
theGuard.get(),
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Fri Apr 3 22:57:09 2009
New Revision: 761831
URL: http://svn.apache.org/viewvc?rev=761831&view=rev
Log:
Enabled code that had been erroneously commented out earlier.
Modified:
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=761831&r1=761830&r2=761831&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Fri Apr 3 22:57:09 2009
@@ -1279,8 +1279,8 @@
}
else
{
- if (fromCopy == false /* ||
- m_resultNamespacesStack.prefixIsPresentLocal(s_emptyString) == false
*/)
+ if (fromCopy == false ||
+ m_resultNamespacesStack.prefixIsPresentLocal(s_emptyString) == false)
{
addResultNamespaceDecl(s_emptyString, value, theLength);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Wed Apr 1 21:01:59 2009
New Revision: 761057
URL: http://svn.apache.org/viewvc?rev=761057&view=rev
Log:
Cleaned up a misspelled macro and some MinGW makefile issues.
Modified:
xalan/c/trunk/Makefile.incl.in
xalan/c/trunk/src/xalanc/Makefile.in
Modified: xalan/c/trunk/Makefile.incl.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Makefile.incl.in?rev=761057&r1=761056&r2=761057&view=diff
==============================================================================
--- xalan/c/trunk/Makefile.incl.in (original)
+++ xalan/c/trunk/Makefile.incl.in Wed Apr 1 21:01:59 2009
@@ -124,27 +124,27 @@
LINK_SONAME =
EXT=.exe
- LOC_LIB = ${LOC_LIBNAME}${VER}$(SHLIBSUFFIX)
+ LOC_LIB = ${LOC_LIBNAME}${VER}$(SHLIBSUFFIX)
- MESSAGELIB = ${XSL_LIB_DIR}/$(LOC_LIB)
- LIB = $(LIB_NAME)$(VER)$(SHLIBSUFFIX)
- SONAME = $(LIB_NAME)$(MS_VER)$(SHLIBSUFFIX)
- PLATFORM_COMPILE_OPTIONS = -DWIN32 -D_WINDOWS -D__MINGW__ -D${PLATFORM} -fexceptions
+ MESSAGELIB = ${XSL_LIB_DIR}/$(LOC_LIB)
+ LIB = $(LIB_NAME)$(VER)$(SHLIBSUFFIX)
+ SONAME = $(LIB_NAME)$(MS_VER)$(SHLIBSUFFIX)
+ PLATFORM_COMPILE_OPTIONS = -DWIN32 -D_WINDOWS -D__MINGW__ -D${PLATFORM} -fexceptions
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC1)
LDFLAGS += -Wl,--allow-multiple-definition
LINK = $(CXX) -D${PLATFORM} ${LDFLAGS}
- MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS} -o $(XSL_LIB_DIR)/$(LIBNAME)
+ MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
- MAKE_SHARED_LOC = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS} -o $(XSL_LIB_DIR)/$(LOC_LIB)
+ MAKE_SHARED_LOC = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
LOC_OTHER_LINK_PARAMETERS = $(XERCES_LIB)
OTHER_LINK_PARAMETERS = $(XALAN_LIB) $(ALLLIBS)
- OTHER_LINK_LIB_PARAMERES = $(ALLLIBS)
+ OTHER_LINK_LIB_PARAMETERS = $(ALLLIBS)
export PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(PATH)
@@ -183,7 +183,7 @@
OTHER_LINK_PARAMETERS = $(XALAN_LIB) $(ALLLIBS)
- OTHER_LINK_LIB_PARAMERES = $(ALLLIBS)
+ OTHER_LINK_LIB_PARAMETERS = $(ALLLIBS)
export PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(PATH)
Modified: xalan/c/trunk/src/xalanc/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Makefile.in?rev=761057&r1=761056&r2=761057&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Makefile.in Wed Apr 1 21:01:59 2009
@@ -232,7 +232,7 @@
$(MAKE) -C Utils $@
$(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
- $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^
-o $@ $(OTHER_LINK_LIB_PARAMERES)
+ $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^
-o $@ $(OTHER_LINK_LIB_PARAMETERS)
ifeq ($(PLATFORM), OS390)
mv *.x ${XSL_LIB_DIR}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sun Mar 29 20:40:25 2009
New Revision: 759782
URL: http://svn.apache.org/viewvc?rev=759782&view=rev
Log:
Tweaks for HP-UX PA-RISC.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=759782&r1=759781&r2=759782&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Sun Mar 29 20:40:25 2009
@@ -456,9 +456,9 @@
void
swap(XalanDeque& theRHS)
{
- XALAN_USING_STD(swap)
-
- swap(m_memoryManager, theRHS.m_memoryManager);
+ MemoryManager* const temp = m_memoryManager;
+ m_memoryManager = theRHS.m_memoryManager;
+ theRHS.m_memoryManager = temp;
theRHS.m_blockIndex.swap(m_blockIndex);
theRHS.m_freeBlockVector.swap(m_freeBlockVector);
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp?rev=759782&r1=759781&r2=759782&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp Sun Mar 29 20:40:25
2009
@@ -54,15 +54,16 @@
* @param theBufferSize The size of the transcoding buffer
*/
XalanFStreamOutputStream(
- FILE* theFileHandle,
+ FILE* theFileHandle,
MemoryManager& theManager,
- size_type theBufferSize = eDefaultBufferSize);
+ size_type theBufferSize = eDefaultBufferSize);
static XalanFStreamOutputStream*
create(
- FILE* theFileHandle,
+ FILE* theFileHandle,
MemoryManager& theManager,
- size_type theBufferSize = eDefaultBufferSize);
+ size_type theBufferSize = eDefaultBufferSize);
+
virtual
~XalanFStreamOutputStream();
@@ -76,8 +77,9 @@
*
* @param theErrorCode number of error encountered
*/
- XalanFStreamOutputStreamWriteException(int theErrorCode,
- XalanDOMString& theBuffer);
+ XalanFStreamOutputStreamWriteException(
+ int theErrorCode,
+ XalanDOMString& theBuffer);
virtual
~XalanFStreamOutputStreamWriteException();
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp?rev=759782&r1=759781&r2=759782&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp Sun Mar 29 20:40:25 2009
@@ -399,6 +399,12 @@
getType() const;
};
+ static XalanDOMString&
+ formatMessage(
+ const XalanDOMString& theMessage,
+ int theErrorCode,
+ XalanDOMString& theBuffer);
+
protected:
/**
@@ -437,12 +443,6 @@
static const XalanDOMString::size_type s_nlStringLength;
static const XalanDOMString::size_type s_nlCRStringLength;
- static XalanDOMString&
- formatMessage(
- const XalanDOMString& theMessage,
- int theErrorCode,
- XalanDOMString& theBuffer);
-
private:
// These are not implemented...
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Mar 28 17:41:45 2009
New Revision: 759520
URL: http://svn.apache.org/viewvc?rev=759520&view=rev
Log:
Cleaned up some some argument names and unnecessary code.
Modified:
xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp
xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp?rev=759520&r1=759519&r2=759520&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp Sat Mar 28 17:41:45 2009
@@ -189,8 +189,9 @@
-XPathExpression::XPathExpressionException::XPathExpressionException(const XalanDOMString&
theMessage,
- MemoryManager&
theManager) :
+XPathExpression::XPathExpressionException::XPathExpressionException(
+ const XalanDOMString& theMessage,
+ MemoryManager& theManager) :
XalanXPathException(theMessage, theManager)
{
}
@@ -203,9 +204,14 @@
-XPathExpression::InvalidOpCodeException::InvalidOpCodeException(OpCodeMapValueType theOpCode,
- XalanDOMString& theResult)
:
-XPathExpressionException(FormatErrorMessage(theOpCode, theResult), theResult.getMemoryManager())
+XPathExpression::InvalidOpCodeException::InvalidOpCodeException(
+ OpCodeMapValueType theOpCode,
+ XalanDOMString& theBuffer) :
+ XPathExpressionException(
+ FormatErrorMessage(
+ theOpCode,
+ theBuffer),
+ theBuffer.getMemoryManager())
{
}
@@ -220,14 +226,14 @@
XalanDOMString&
XPathExpression::InvalidOpCodeException::FormatErrorMessage(
OpCodeMapValueType theOpCode,
- XalanDOMString& theResult)
+ XalanDOMString& theBuffer)
{
- XalanDOMString theOpcode(theResult.getMemoryManager());
+ XalanDOMString theOpcode(theBuffer.getMemoryManager());
NumberToDOMString(theOpCode, theOpcode);
return XalanMessageLoader::getMessage(
- theResult,
+ theBuffer,
XalanMessages::InvalidOpcodeWasDetected_1Param,
theOpcode);
}
@@ -238,14 +244,14 @@
OpCodeMapValueType theOpCode,
OpCodeMapValueType theExpectedCount,
OpCodeMapValueType theSuppliedCount,
- XalanDOMString& theResult) :
+ XalanDOMString& theBuffer) :
XPathExpressionException(
FormatErrorMessage(
theOpCode,
theExpectedCount,
theSuppliedCount,
- theResult),
- theResult.getMemoryManager())
+ theBuffer),
+ theBuffer.getMemoryManager())
{
}
@@ -276,7 +282,7 @@
return XalanMessageLoader::getMessage(
- theBuffer ,
+ theBuffer,
XalanMessages::InvalidNumberOfArgsWasDetected_3Param,
theResult1,
theResult2);
@@ -287,13 +293,13 @@
XPathExpression::InvalidArgumentException::InvalidArgumentException(
OpCodeMapValueType theOpCode,
OpCodeMapValueType theValue,
- XalanDOMString& theResult) :
+ XalanDOMString& theBuffer) :
XPathExpressionException(
FormatErrorMessage(
theOpCode,
theValue,
- theResult),
- theResult.getMemoryManager())
+ theBuffer),
+ theBuffer.getMemoryManager())
{
}
@@ -354,9 +360,6 @@
void
XPathExpression::reset()
{
- XALAN_USING_STD(fill);
- XALAN_USING_STD(for_each);
-
m_opMap.clear();
m_tokenQueue.clear();
}
@@ -380,8 +383,8 @@
XPathExpression::OpCodeMapValueType
XPathExpression::getOpCodeLengthFromOpMap(
- OpCodeMapPositionType opPos,
- MemoryManager& theManager) const
+ OpCodeMapPositionType opPos,
+ MemoryManager& theManager) const
{
assert(opPos - getInitialOpCodePosition() >= 0 &&
opPos - getInitialOpCodePosition() < opCodeMapSize());
@@ -393,9 +396,9 @@
if (theOpCodeLength == 0)
{
- XalanDOMString theResult(theManager);
+ XalanDOMString theBuffer(theManager);
- throw InvalidOpCodeException(-1, theResult);
+ throw InvalidOpCodeException(-1, theBuffer);
}
else
{
@@ -415,19 +418,19 @@
XPathExpression::OpCodeMapValueType
XPathExpression::getOpCodeLengthFromOpMap(
#if defined(XALAN_XPATH_EXPRESSION_USE_ITERATORS)
- OpCodeMapSizeType theIndex,
+ OpCodeMapSizeType theIndex,
#else
- OpCodeMapPositionType theIndex,
+ OpCodeMapPositionType theIndex,
#endif
- MemoryManager& theManager) const
+ MemoryManager& theManager) const
{
OpCodeMapValueType theResult = 0;
if (theIndex >= opCodeMapSize())
{
- XalanDOMString theResult(theManager);
+ XalanDOMString theBuffer(theManager);
- throw InvalidOpCodeException(-1, theResult);
+ throw InvalidOpCodeException(-1, theBuffer);
}
else
{
@@ -436,9 +439,9 @@
if (theOpCodeLength == 0)
{
- XalanDOMString theResult(theManager);
+ XalanDOMString theBuffer(theManager);
- throw InvalidOpCodeException(-1, theResult);
+ throw InvalidOpCodeException(-1, theBuffer);
}
else
{
@@ -473,9 +476,11 @@
if (theOpCodeLength == 0 ||
m_opMap[theIndex] != theOpCode)
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
@@ -484,12 +489,13 @@
if (OpCodeMapValueVectorType::size_type(theArgCount) != theArgs.size())
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidArgumentCountException(theOpCode,
- theOpCodeLength,
- theArgCount,
- theResult);
+ throw InvalidArgumentCountException(
+ theOpCode,
+ theOpCodeLength,
+ theArgCount,
+ theBuffer);
}
else
{
@@ -499,10 +505,12 @@
{
if (theArgs[i] < 0)
{
- XalanDOMString theResult( getMemoryManager() );
- throw InvalidArgumentException(theOpCode,
- theArgs[i],
- theResult);
+ XalanDOMString theBuffer(getMemoryManager());
+
+ throw InvalidArgumentException(
+ theOpCode,
+ theArgs[i],
+ theBuffer);
}
else
{
@@ -523,9 +531,11 @@
if (theOpCodeLength == 0)
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
@@ -571,9 +581,11 @@
m_opMap[theIndex] != theOldOpCode ||
getOpCodeLength(theOldOpCode) != getOpCodeLength(theNewOpCode))
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theNewOpCode, theResult);
+ throw InvalidOpCodeException(
+ theNewOpCode,
+ theBuffer);
}
else
{
@@ -592,9 +604,11 @@
if (theOpCodeLength == 0)
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
@@ -643,9 +657,11 @@
if (theOpCodeLength == 0 ||
m_opMap[theNewIndex] != theOpCode)
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
@@ -657,9 +673,11 @@
// Too long, then throw an exception.
if (theLengthIndex >= opCodeMapSize())
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
@@ -695,9 +713,11 @@
if (theOpCodeLength == 0 ||
m_opMap[theIndex] != theOpCode)
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
@@ -746,9 +766,11 @@
if (theOpCodeLength == 0 ||
isNodeTestOpCode(theOpCode) == false)
{
- XalanDOMString theResult( getMemoryManager() );
+ XalanDOMString theBuffer(getMemoryManager());
- throw InvalidOpCodeException(theOpCode, theResult);
+ throw InvalidOpCodeException(
+ theOpCode,
+ theBuffer);
}
else
{
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp?rev=759520&r1=759519&r2=759520&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp Sat Mar 28 17:41:45 2009
@@ -627,8 +627,9 @@
*
* @param theOpCode operation code that caused the exception
*/
- InvalidOpCodeException(OpCodeMapValueType theOpCode,
- XalanDOMString& theResult);
+ InvalidOpCodeException(
+ OpCodeMapValueType theOpCode,
+ XalanDOMString& theBuffer);
virtual~
InvalidOpCodeException();
@@ -636,8 +637,9 @@
private:
static XalanDOMString&
- FormatErrorMessage(OpCodeMapValueType theOpCode,
- XalanDOMString& theResult);
+ FormatErrorMessage(
+ OpCodeMapValueType theOpCode,
+ XalanDOMString& theBuffer);
};
/**
@@ -659,7 +661,7 @@
OpCodeMapValueType theOpCode,
OpCodeMapValueType theExpectedCount,
OpCodeMapValueType theSuppliedCount,
- XalanDOMString& theResult);
+ XalanDOMString& theBuffer);
virtual~
InvalidArgumentCountException();
@@ -671,7 +673,7 @@
OpCodeMapValueType theOpCode,
OpCodeMapValueType theExpectedCount,
OpCodeMapValueType theSuppliedCount,
- XalanDOMString& theResult);
+ XalanDOMString& theBuffer);
};
/**
@@ -690,7 +692,7 @@
InvalidArgumentException(
OpCodeMapValueType theOpCode,
OpCodeMapValueType theValue,
- XalanDOMString& theResult);
+ XalanDOMString& theBuffer);
virtual~
InvalidArgumentException();
@@ -701,7 +703,7 @@
FormatErrorMessage(
OpCodeMapValueType theOpCode,
OpCodeMapValueType theValue,
- XalanDOMString& theResult);
+ XalanDOMString& theBuffer);
};
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Mar 28 17:40:25 2009
New Revision: 759517
URL: http://svn.apache.org/viewvc?rev=759517&view=rev
Log:
Update a comment.
Modified:
xalan/c/trunk/src/xalanc/XMLSupport/XMLParserLiaison.hpp
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XMLParserLiaison.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XMLParserLiaison.hpp?rev=759517&r1=759516&r2=759517&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XMLParserLiaison.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XMLParserLiaison.hpp Sat Mar 28 17:40:25 2009
@@ -114,8 +114,8 @@
* can be recognized if the parse fails.
*
* The liaison owns the XalanDocument instance, and will delete it when
- * when asked (see DestroyDocument()), or when the liaison is reset, or
- * goes out of scope.
+ * asked (see DestroyDocument()), or when the liaison is reset, or goes
+ * out of scope.
*
* This function is not reentrant, so you cannot call it again until
* the current call exits.
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Mar 28 17:39:04 2009
New Revision: 759516
URL: http://svn.apache.org/viewvc?rev=759516&view=rev
Log:
Fixes for building on Solaris with Sun Workshop and STLport 4.
Modified:
xalan/c/trunk/Tests/Performance/perf.cpp
xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp
xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
Modified: xalan/c/trunk/Tests/Performance/perf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Performance/perf.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Performance/perf.cpp (original)
+++ xalan/c/trunk/Tests/Performance/perf.cpp Sat Mar 28 17:39:04 2009
@@ -30,6 +30,12 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::strcmp;
+#endif
+
+
+
#include <xercesc/util/PlatformUtils.hpp>
Modified: xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp (original)
+++ xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp Sat Mar 28
17:39:04 2009
@@ -34,6 +34,16 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+using std::fclose;
+using std::fflush;
+using std::fopen;
+using std::fwrite;
+#endif
+
+
+
// This is a simple class that illustrates how XalanTransformer's "callback" API
// is used. This example just abstracts writing data to a FILE*, but other
// actions are possible.
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Sat Mar 28 17:39:04 2009
@@ -58,6 +58,21 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::fclose;
+using std::feof;
+using std::ferror;
+using std::fgets;
+using std::fopen;
+using std::localtime;
+using std::sprintf;
+using std::strftime;
+using std::tm;
+using std::time;
+#endif
+
+
+
#include "xercesc/sax/ErrorHandler.hpp"
#include "xercesc/sax/SAXException.hpp"
#include "xercesc/sax/SAXParseException.hpp"
@@ -628,13 +643,6 @@
XalanDOMString&
XalanFileUtility::generateUniqRunid(XalanDOMString& theResult)
{
-#if defined(XALAN_STRICT_ANSI_HEADERS)
- using std::tm;
- using std::time;
- using std::localtime;
- using std::strftime;
-#endif
-
struct tm *newtime;
time_t long_time;
char tmpbuf[10];
Modified: xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp Sat Mar 28 17:39:04 2009
@@ -37,6 +37,17 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::fclose;
+using std::fflush;
+using std::fopen;
+using std::fprintf;
+using std::fputs;
+using std::sprintf;
+#endif
+
+
+
XalanOutputTranscoder*
makeNewUTF8Transcoder(MemoryManager& theMemoryManager)
{
@@ -921,14 +932,6 @@
XalanDOMString &
XalanXMLFileReporter::getDateTimeString(XalanDOMString& theResult)
{
-#if defined(XALAN_STRICT_ANSI_HEADERS)
- using std::tm;
- using std::time;
- using std::localtime;
- using std::asctime;
- using std::strlen;
-#endif
-
struct tm *tmNow;
time_t time_tNow;
Modified: xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp Sat Mar 28 17:39:04 2009
@@ -35,7 +35,12 @@
#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_STRICT_ANSI_HEADERS
+#if defined(_STLP_CONFIG_H)
+#define XALAN_HAS_STD_ITERATORS
+#define XALAN_HAS_STD_DISTANCE
+#else
#define XALAN_RW_NO_CLASS_PARTIAL_SPEC
+#endif
#define XALAN_POSIX2_AVAILABLE
#if defined(__sparc)
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DoubleSupport.hpp Sat Mar 28 17:39:04 2009
@@ -28,7 +28,7 @@
#if defined(_MSC_VER)
#include <float.h>
#endif
-#include <cmath>
+#include <math.h>
#include <functional>
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp Sat Mar 28 17:39:04
2009
@@ -86,6 +86,10 @@
const char* theBuffer,
size_type theBufferLength)
{
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fwrite;
+#endif
+
const size_t theBytesWritten =
fwrite(theBuffer,
1,
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp Sat Mar 28 17:39:04
2009
@@ -36,7 +36,9 @@
XALAN_CPP_NAMESPACE_BEGIN
-
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+#endif
class XALAN_PLATFORMSUPPORT_EXPORT XalanFStreamOutputStream : public XalanOutputStream
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Sat Mar 28 17:39:04
2009
@@ -168,6 +168,10 @@
}
}
#else
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fopen;
+#endif
+
CharVectorType theResult(theManager);
TranscodeToLocalCodePage(theFileName, theResult, true);
@@ -257,6 +261,10 @@
CloseHandle(m_handle);
}
#else
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fclose;
+#endif
+
if (m_handle != 0)
{
fclose(m_handle);
@@ -270,9 +278,14 @@
XalanFileOutputStream::doFlush()
{
#if !defined(XALAN_WINDOWS)
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fflush;
+#endif
+
if (fflush(m_handle) != 0)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theBuffer(getMemoryManager());
+
throw XalanFileOutputStreamWriteException(
m_fileName,
errno,
@@ -304,6 +317,10 @@
theExceptionBuffer);
}
#else
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::fwrite;
+#endif
+
const size_t theBytesWritten =
fwrite(theBuffer,
1,
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp Sat Mar 28 17:39:04
2009
@@ -41,6 +41,9 @@
XALAN_CPP_NAMESPACE_BEGIN
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+#endif
class XALAN_PLATFORMSUPPORT_EXPORT XalanFileOutputStream : public XalanOutputStream
{
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp Sat Mar 28 17:39:04 2009
@@ -31,7 +31,9 @@
XALAN_CPP_NAMESPACE_BEGIN
-
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::sprintf;
+#endif
// -----------------------------------------------------------------------
// Constructors
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp Sat Mar 28 17:39:04 2009
@@ -35,6 +35,9 @@
XALAN_CPP_NAMESPACE_BEGIN
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::sprintf;
+#endif
XALAN_USING_XERCES(Attributes)
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp?rev=759516&r1=759515&r2=759516&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp Sat Mar 28 17:39:04 2009
@@ -66,6 +66,12 @@
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+using std::FILE;
+#endif
+
+
+
class CountersTable;
class ElemTemplate;
class ElemTemplateElement;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Jan 17 10:45:02 2009
New Revision: 735324
URL: http://svn.apache.org/viewvc?rev=735324&view=rev
Log:
Made the function formatMessageLocal(), in XalanFSStreamOutputStream.cpp, a static member
function of XalanOutputStream to avoid having XalanFileOutputStream refer to it as an extern.
Modified:
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp?rev=735324&r1=735323&r2=735324&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp Sat Jan 17 10:45:02
2009
@@ -94,39 +94,16 @@
if (theBytesWritten != theBufferLength)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theExceptionBuffer(getMemoryManager());
- throw XalanFStreamOutputStreamWriteException(errno, theBuffer);
+ throw XalanFStreamOutputStreamWriteException(
+ errno,
+ theExceptionBuffer);
}
}
-XalanDOMString&
-FormatMessageLocal(
- const XalanDOMString& theMessage,
- int theErrorCode,
- XalanDOMString& theResult)
-{
- XalanDOMString strErrorCode(theResult.getMemoryManager());
-
- XalanDOMString strErrorMsg(theResult.getMemoryManager());
-
- NumberToDOMString(theErrorCode, strErrorCode);
-
- theResult.assign(theMessage);
-
- XalanMessageLoader::getMessage(
- strErrorMsg,
- XalanMessages::SystemErrorCode_1Param,
- strErrorCode);
-
- theResult.append(strErrorMsg);
-
- return theResult;
-}
-
-
const XalanDOMChar XalanFStreamOutputStream::XalanFStreamOutputStreamWriteException::m_type[]
=
{
XalanUnicode::charLetter_X,
@@ -171,7 +148,7 @@
int theErrorCode,
XalanDOMString& theBuffer) :
XalanOutputStreamException(
- FormatMessageLocal(
+ formatMessage(
XalanMessageLoader::getMessage(
theBuffer,
XalanMessages::ErrorWritingFile_1Param,
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=735324&r1=735323&r2=735324&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Sat Jan 17 10:45:02
2009
@@ -139,6 +139,7 @@
{
CharVectorType theResult(theManager);
+
TranscodeToLocalCodePage(theFileName, theResult, true);
if (theResult.empty() == true)
@@ -295,12 +296,12 @@
if (WriteFile(m_handle, theBuffer, DWORD(theBufferLength), &theBytesWritten, 0) ==
false ||
theBytesWritten != theBufferLength)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theExceptionBuffer(getMemoryManager());
throw XalanFileOutputStreamWriteException(
- m_fileName,
- GetLastError(),
- theBuffer);
+ m_fileName,
+ GetLastError(),
+ theExceptionBuffer);
}
#else
const size_t theBytesWritten =
@@ -311,32 +312,24 @@
if (theBytesWritten != theBufferLength)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theExceptionBuffer(getMemoryManager());
throw XalanFileOutputStreamWriteException(
- m_fileName,
- errno,
- theBuffer);
+ m_fileName,
+ errno,
+ theExceptionBuffer);
}
#endif
}
-extern XalanDOMString&
-FormatMessageLocal(
- const XalanDOMString& theMessage,
- int theErrorCode,
- XalanDOMString& theResult);
-
-
-
XalanFileOutputStream::XalanFileOutputStreamOpenException::XalanFileOutputStreamOpenException(
const XalanDOMString& theFileName,
int theErrorCode,
XalanDOMString& theBuffer,
const Locator* theLocator) :
XalanOutputStreamException(
- FormatMessageLocal(
+ formatMessage(
XalanMessageLoader::getMessage(
theBuffer,
XalanMessages::ErrorOpeningFile_1Param,
@@ -362,7 +355,7 @@
XalanDOMString& theBuffer,
const Locator* theLocator) :
XalanOutputStreamException(
- FormatMessageLocal(
+ formatMessage(
XalanMessageLoader::getMessage(
theBuffer,
XalanMessages::ErrorWritingFile_1Param,
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp?rev=735324&r1=735323&r2=735324&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp Sat Jan 17 10:45:02 2009
@@ -62,8 +62,6 @@
-
-
XalanOutputStream::XalanOutputStream(
MemoryManager& theManager,
size_type theBufferSize,
@@ -138,15 +136,17 @@
{
if (m_throwTranscodeException == true)
{
- XalanDOMString theBuffer(theDestination.getMemoryManager());
+ XalanDOMString theExceptionBuffer(theDestination.getMemoryManager());
- throw TranscodingException(theBuffer, 0);
+ throw TranscodingException(
+ theExceptionBuffer,
+ 0);
}
}
}
else
{
- bool fDone = false;
+ bool fDone = false;
// Keep track of the total bytes we've added to the
// destination vector, and the total bytes we've
@@ -190,9 +190,11 @@
{
if (m_throwTranscodeException == true)
{
- XalanDOMString theBuffer(theDestination.getMemoryManager());
+ XalanDOMString theExceptionBuffer(theDestination.getMemoryManager());
- throw TranscodingException(theBuffer, 0);
+ throw TranscodingException(
+ theExceptionBuffer,
+ 0);
}
}
@@ -262,13 +264,13 @@
if (theCode == XalanTranscodingServices::UnsupportedEncoding ||
theCode == XalanTranscodingServices::SupportFilesNotFound)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theBuffer(getMemoryManager());
throw UnsupportedEncodingException(theEncoding, theBuffer, 0);
}
else if (theCode != XalanTranscodingServices::OK)
{
- XalanDOMString theBuffer(getMemoryManager());
+ XalanDOMString theBuffer(getMemoryManager());
throw TranscoderInternalFailureException(theEncoding, theBuffer, 0);
}
@@ -727,4 +729,31 @@
+XalanDOMString&
+XalanOutputStream::formatMessage(
+ const XalanDOMString& theMessage,
+ int theErrorCode,
+ XalanDOMString& theBuffer)
+{
+ XalanDOMString strErrorCode(theBuffer.getMemoryManager());
+
+ XalanDOMString strErrorMsg(theBuffer.getMemoryManager());
+
+ NumberToDOMString(theErrorCode, strErrorCode);
+
+ theBuffer.assign(theMessage);
+
+ XalanMessageLoader::getMessage(
+ strErrorMsg,
+ XalanMessages::SystemErrorCode_1Param,
+ strErrorCode);
+
+ theBuffer.append(strErrorMsg);
+
+ return theBuffer;
+}
+
+
+
+
XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp?rev=735324&r1=735323&r2=735324&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp Sat Jan 17 10:45:02 2009
@@ -437,6 +437,12 @@
static const XalanDOMString::size_type s_nlStringLength;
static const XalanDOMString::size_type s_nlCRStringLength;
+ static XalanDOMString&
+ formatMessage(
+ const XalanDOMString& theMessage,
+ int theErrorCode,
+ XalanDOMString& theBuffer);
+
private:
// These are not implemented...
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Jan 17 10:40:57 2009
New Revision: 735323
URL: http://svn.apache.org/viewvc?rev=735323&view=rev
Log:
Fixed typos and problems with building on Visual Studio 6.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=735323&r1=735322&r2=735323&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Sat Jan 17 10:40:57 2009
@@ -84,7 +84,7 @@
{
}
- // The is standard copy-construction for the non-const iterator type. For the
+ // This is standard copy-construction for the non-const iterator type. For the
// const iterator type, this is copy construction from the non-const type, and the
// compiler will generate the standard copy constructor.
XalanDequeIterator(const Iterator& iterator) :
@@ -93,7 +93,7 @@
{
}
- // The is the standard assignment operator for the non-const iterator type.
+ // This is the standard assignment operator for the non-const iterator type.
// For the const iterator type, this is the assignment operator from the
// non-const type, and the compiler will generate the standard assignment
// operator.
@@ -529,7 +529,15 @@
while (iter != theBlockIndex.end())
{
- XalanDestroy(*m_memoryManager, **iter);
+ // Normally, we should be able to just call
+ // the version of XalanDestroy() that accepts
+ // a pointer, but Visual Studio 6 has issues
+ // with partial ordering, so we're stuck with
+ // this for now.
+ if (*iter != 0)
+ {
+ XalanDestroy(*m_memoryManager, **iter);
+ }
++iter;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 22 13:59:33 2008
New Revision: 728798
URL: http://svn.apache.org/viewvc?rev=728798&view=rev
Log:
Visual C++ 6.0 fix.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=728798&r1=728797&r2=728798&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Mon Dec 22 13:59:33 2008
@@ -529,7 +529,7 @@
while (iter != theBlockIndex.end())
{
- XalanDestroy(*m_memoryManager, *iter);
+ XalanDestroy(*m_memoryManager, **iter);
++iter;
}
@@ -545,8 +545,8 @@
const size_type m_blockSize;
- BlockIndexType m_blockIndex;
- BlockIndexType m_freeBlockVector;
+ BlockIndexType m_blockIndex;
+ BlockIndexType m_freeBlockVector;
// These are not implemented
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 8 13:04:49 2008
New Revision: 724482
URL: http://svn.apache.org/viewvc?rev=724482&view=rev
Log:
Removed obsolete author tag. Fixed assignment operator to protect against self-assignment.
Updated XalanDequeIterator and XalanDeque to avoid exposing data members. Fixed some issues
where exceptions might cause memory leaks. Used a typedef for better clarity, and added and
updated some comments.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=724482&r1=724481&r2=724482&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Mon Dec 8 13:04:49 2008
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-/**
- * @author Matthew Hoyt (mhoyt@ca.ibm.com)
- */
-
#if !defined(XALANDEQUE_HEADER_GUARD_1357924680)
#define XALANDEQUE_HEADER_GUARD_1357924680
@@ -57,107 +53,144 @@
typedef const Value& const_reference;
};
-template <class XalanDequeTraits, class XalanDeque>
-struct XalanDequeIterator
+template <class Traits, class XalanDeque>
+class XalanDequeIterator
{
- typedef size_t size_type;
- typedef typename XalanDequeTraits::value_type value_type;
- typedef typename XalanDequeTraits::reference reference;
- typedef typename XalanDequeTraits::pointer pointer;
- typedef typename XalanDequeTraits::const_reference const_reference;
- typedef ptrdiff_t difference_type;
-
- typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, XalanDeque>
Iterator;
-
- typedef XALAN_STD_QUALIFIER random_access_iterator_tag iterator_category;
+public:
- XalanDequeIterator(XalanDeque* deque,
- size_type pos) :
+ typedef size_t size_type;
+ typedef typename Traits::value_type value_type;
+ typedef typename Traits::reference reference;
+ typedef typename Traits::pointer pointer;
+ typedef typename Traits::const_reference const_reference;
+ typedef ptrdiff_t difference_type;
+
+ typedef XALAN_STD_QUALIFIER random_access_iterator_tag iterator_category;
+
+ // The non-const iterator type. In the case of the non-const instatiation, this
+ // is the same type.
+ typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, XalanDeque>
Iterator;
+
+ // The const version needs access to our private data members for copy construction and
+ // assignment. For the const instantiation, this is a superfluous friend declaration,
+ // since it's the same type as the class itself.
+ friend class XalanDequeIterator<XalanDequeConstIteratorTraits<value_type>, XalanDeque>;
+
+ XalanDequeIterator(
+ XalanDeque* deque,
+ size_type pos) :
m_deque(deque),
m_pos(pos)
{
}
- XalanDequeIterator(const Iterator & iterator) :
+ // The is standard copy-construction for the non-const iterator type. For the
+ // const iterator type, this is copy construction from the non-const type, and the
+ // compiler will generate the standard copy constructor.
+ XalanDequeIterator(const Iterator& iterator) :
m_deque(iterator.m_deque),
m_pos(iterator.m_pos)
{
}
- XalanDequeIterator& operator=(const Iterator & iterator)
+ // The is the standard assignment operator for the non-const iterator type.
+ // For the const iterator type, this is the assignment operator from the
+ // non-const type, and the compiler will generate the standard assignment
+ // operator.
+ XalanDequeIterator&
+ operator=(const Iterator& iterator)
{
m_deque = iterator.m_deque;
m_pos = iterator.m_pos;
+
return *this;
}
- XalanDequeIterator& operator++()
+ XalanDequeIterator&
+ operator++()
{
++m_pos;
+
return *this;
}
- XalanDequeIterator operator++(int)
+ XalanDequeIterator
+ operator++(int)
{
XalanDequeIterator temp = *this;
++m_pos;
+
return temp;
}
- XalanDequeIterator& operator--()
+ XalanDequeIterator&
+ operator--()
{
--m_pos;
+
return *this;
}
- pointer operator->()
+ pointer
+ operator->()
{
return &(*m_deque[m_pos]);
}
- reference operator*()
+ reference
+ operator*()
{
return (*m_deque)[m_pos];
}
- const_reference operator*() const
+ const_reference
+ operator*() const
{
return (*m_deque)[m_pos];
}
- XalanDequeIterator operator+(difference_type difference) const
+ XalanDequeIterator
+ operator+(difference_type difference) const
{
return XalanDequeIterator(m_deque, m_pos + difference);
}
- XalanDequeIterator operator-(difference_type difference) const
+ XalanDequeIterator
+ operator-(difference_type difference) const
{
return XalanDequeIterator(m_deque, m_pos - difference);
}
- difference_type operator-(const XalanDequeIterator &theRhs) const
+ difference_type
+ operator-(const XalanDequeIterator& theRHS) const
{
- return m_pos - theRhs.m_pos;
+ return m_pos - theRHS.m_pos;
}
- bool operator==(const XalanDequeIterator & theRhs) const
+ bool
+ operator==(const XalanDequeIterator& theRHS) const
{
- return (theRhs.m_deque == m_deque)
- && theRhs.m_pos == m_pos;
+ return theRHS.m_deque == m_deque &&
+ theRHS.m_pos == m_pos;
}
- bool operator!=(const XalanDequeIterator & theRhs) const
+ bool
+ operator!=(const XalanDequeIterator& theRHS) const
{
- return !(theRhs == *this);
+ return !(theRHS == *this);
}
- bool operator<(const XalanDequeIterator & theRhs) const
+ bool
+ operator<(const XalanDequeIterator& theRHS) const
{
- return m_pos < theRhs.m_pos;
+ return m_pos < theRHS.m_pos;
}
- XalanDeque* m_deque;
- size_type m_pos;
+private:
+
+ XalanDeque* m_deque;
+
+ size_type m_pos;
};
/**
@@ -168,77 +201,98 @@
{
public:
-
typedef size_t size_type;
typedef Type value_type;
typedef Type& reference;
typedef const Type& const_reference;
- typedef XalanVector<Type, ConstructionTraits> BlockType;
+ typedef XalanVector<Type, ConstructionTraits> BlockType;
+ typedef XalanVector<BlockType*> BlockIndexType;
- typedef XalanVector<BlockType*> BlockIndexType;
+ typedef XalanDeque<Type, ConstructionTraits> ThisType;
- typedef XalanDeque<Type, ConstructionTraits> ThisType;
- typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, ThisType>
iterator;
+ typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, ThisType>
iterator;
typedef XalanDequeIterator<XalanDequeConstIteratorTraits<value_type>, ThisType>
const_iterator;
#if defined(XALAN_HAS_STD_ITERATORS)
typedef XALAN_STD_QUALIFIER reverse_iterator<iterator> reverse_iterator_;
typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator> const_reverse_iterator_;
#elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
+ typedef typename iterator::iterator_category iterator_category;
+
+ // This is a specific case for the Rogue Wave STL on Solaris.
typedef XALAN_STD_QUALIFIER reverse_iterator<
iterator,
- XALAN_STD_QUALIFIER random_access_iterator_tag,
+ iterator_category,
value_type> reverse_iterator_;
+
typedef XALAN_STD_QUALIFIER reverse_iterator<
const_iterator,
- XALAN_STD_QUALIFIER random_access_iterator_tag,
+ iterator_category,
const value_type> const_reverse_iterator_;
#else
- typedef XALAN_STD_QUALIFIER reverse_iterator<iterator, value_type>
reverse_iterator_;
- typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator, value_type, const_reference>
const_reverse_iterator_;
+ typedef XALAN_STD_QUALIFIER reverse_iterator<
+ iterator,
+ value_type> reverse_iterator_;
+
+ typedef XALAN_STD_QUALIFIER reverse_iterator<
+ const_iterator,
+ value_type,
+ const_reference> const_reverse_iterator_;
#endif
typedef reverse_iterator_ reverse_iterator;
typedef const_reverse_iterator_ const_reverse_iterator;
typedef typename ConstructionTraits::Constructor Constructor;
- typedef typename Constructor::ConstructableType ConstructibleType;
+ typedef typename Constructor::ConstructableType ConstructableType;
XalanDeque(
- MemoryManager& memoryManager,
- size_type initialSize = 0,
- size_type blockSize = 10) :
+ MemoryManager& memoryManager,
+ size_type initialSize = 0,
+ size_type blockSize = 10) :
m_memoryManager(&memoryManager),
m_blockSize(blockSize),
m_blockIndex(memoryManager,
initialSize / blockSize + (initialSize % blockSize == 0 ? 0 : 1)),
m_freeBlockVector(memoryManager)
{
- typename Constructor::ConstructableType defaultValue(*m_memoryManager);
+ const ConstructableType defaultValue(*m_memoryManager);
+
+ XALAN_USING_STD(fill_n)
+ XALAN_USING_STD(back_inserter)
- XALAN_STD_QUALIFIER fill_n(XALAN_STD_QUALIFIER back_inserter(*this), initialSize,
defaultValue.value);
+ fill_n(
+ back_inserter(*this),
+ initialSize,
+ defaultValue.value);
}
- XalanDeque(const XalanDeque& theRhs, MemoryManager& memoryManager) :
- m_memoryManager(&memoryManager),
- m_blockSize(theRhs.m_blockSize),
- m_blockIndex(*theRhs.m_memoryManager,
- theRhs.size() / theRhs.m_blockSize + (theRhs.size() % theRhs.m_blockSize
== 0 ? 0 : 1)),
- m_freeBlockVector(memoryManager)
- {
- XALAN_STD_QUALIFIER copy(theRhs.begin(), theRhs.end(), XALAN_STD_QUALIFIER back_inserter(*this));
+ XalanDeque(
+ const XalanDeque& theRHS,
+ MemoryManager& theMemoryManager) :
+ m_memoryManager(&theMemoryManager),
+ m_blockSize(theRHS.m_blockSize),
+ m_blockIndex(*theRHS.m_memoryManager,
+ theRHS.size() / theRHS.m_blockSize + (theRHS.size() % theRHS.m_blockSize
== 0 ? 0 : 1)),
+ m_freeBlockVector(theMemoryManager)
+ {
+ XALAN_USING_STD(copy)
+ XALAN_USING_STD(back_inserter)
+
+ copy(
+ theRHS.begin(),
+ theRHS.end(),
+ back_inserter(*this));
}
-
+
static XalanDeque*
create(
MemoryManager& theManager,
size_type initialSize = 0,
size_type blockSize = 10)
{
- typedef XalanDeque ThisType;
-
XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
ThisType* const theResult =
@@ -256,42 +310,50 @@
destroyBlockList(m_blockIndex);
}
- iterator begin()
+ iterator
+ begin()
{
return iterator(this, 0);
}
- const_iterator begin() const
+ const_iterator
+ begin() const
{
return const_iterator(const_cast<XalanDeque*>(this), 0);
}
- iterator end()
+ iterator
+ end()
{
return iterator(this, size());
}
- const_iterator end() const
+ const_iterator
+ end() const
{
return const_iterator(const_cast<XalanDeque*>(this), size());
}
- const_reverse_iterator rbegin() const
+ const_reverse_iterator
+ rbegin() const
{
return const_reverse_iterator(end());
}
- const_reverse_iterator rend() const
+ const_reverse_iterator
+ rend() const
{
return const_reverse_iterator(begin());
}
- bool empty() const
+ bool
+ empty() const
{
return m_blockIndex.empty();
}
- size_type size() const
+ size_type
+ size() const
{
if (m_blockIndex.empty())
{
@@ -304,26 +366,32 @@
}
}
- value_type& back()
+ value_type&
+ back()
{
return m_blockIndex.back()->back();
}
- value_type& operator[](size_type index)
+ value_type&
+ operator[](size_type index)
{
- BlockType & block = *(m_blockIndex[index / m_blockSize]);
+ BlockType& block = *m_blockIndex[index / m_blockSize];
+
return block[index % m_blockSize];
}
- const value_type& operator[](size_type index) const
+ const value_type&
+ operator[](size_type index) const
{
- BlockType & block = *(m_blockIndex[index / m_blockSize]);
+ BlockType& block = *m_blockIndex[index / m_blockSize];
+
return block[index % m_blockSize];
}
- void clear()
+ void
+ clear()
{
- typename BlockIndexType::iterator iter = m_blockIndex.begin();
+ typename BlockIndexType::iterator iter = m_blockIndex.begin();
m_freeBlockVector.reserve(m_freeBlockVector.size() + m_blockIndex.size());
@@ -333,25 +401,30 @@
m_freeBlockVector.push_back(*iter);
++iter;
}
-
+
m_blockIndex.clear();
}
- void push_back(const value_type & value)
+ void
+ push_back(const value_type& value)
{
if (m_blockIndex.empty() ||
m_blockIndex.back()->size() >= m_blockSize)
{
- m_blockIndex.push_back(getNewBlock());
+ pushNewIndexBlock();
}
m_blockIndex.back()->push_back(value);
}
- void pop_back()
+ void
+ pop_back()
{
- BlockType & lastBlock = *(m_blockIndex.back());
+ assert(!empty());
+
+ BlockType& lastBlock = *m_blockIndex.back();
lastBlock.pop_back();
+
if (lastBlock.empty())
{
m_freeBlockVector.push_back(&lastBlock);
@@ -359,9 +432,10 @@
}
}
- void resize(size_type newSize)
+ void
+ resize(size_type newSize)
{
- typename Constructor::ConstructableType defaultValue(*m_memoryManager);
+ const ConstructableType defaultValue(*m_memoryManager);
if (newSize > size())
{
@@ -379,20 +453,33 @@
}
}
- void swap(XalanDeque& theRhs)
+ void
+ swap(XalanDeque& theRHS)
{
- MemoryManager* tempMemoryManager = m_memoryManager;
- m_memoryManager = theRhs.m_memoryManager;
- theRhs.m_memoryManager = tempMemoryManager;
+ XALAN_USING_STD(swap)
- theRhs.m_blockIndex.swap(m_blockIndex);
- theRhs.m_freeBlockVector.swap(m_freeBlockVector);
+ swap(m_memoryManager, theRHS.m_memoryManager);
+
+ theRHS.m_blockIndex.swap(m_blockIndex);
+ theRHS.m_freeBlockVector.swap(m_freeBlockVector);
}
- XalanDeque & operator=(const XalanDeque & theRhs)
+ XalanDeque&
+ operator=(const XalanDeque& theRHS)
{
- clear();
- XALAN_STD_QUALIFIER copy(theRhs.begin(), theRhs.end(), XALAN_STD_QUALIFIER back_inserter(*this));
+ if (this != &theRHS)
+ {
+ XALAN_USING_STD(copy)
+ XALAN_USING_STD(back_inserter)
+
+ clear();
+
+ copy(
+ theRHS.begin(),
+ theRHS.end(),
+ back_inserter(*this));
+ }
+
return *this;
}
@@ -404,38 +491,34 @@
return *m_memoryManager;
}
-protected:
+private:
- BlockType* getNewBlock()
+ void
+ pushNewIndexBlock()
{
- BlockType * newBlock;
+ // Allocate space first, so we don't have to worry
+ // about an out-of-memory error once we've constructed
+ // the new block.
+ m_blockIndex.push_back(0);
if (m_freeBlockVector.empty())
{
- newBlock = allocate(1);
- new (&*newBlock) BlockType(*m_memoryManager, m_blockSize);
+ XalanConstruct(
+ *m_memoryManager,
+ m_blockIndex.back(),
+ *m_memoryManager,
+ m_blockSize);
}
else
{
- newBlock = m_freeBlockVector.back();
+ m_blockIndex.back() = m_freeBlockVector.back();
+
+ // Now that ownership has been transfered, pop
+ // it off the free list.
m_freeBlockVector.pop_back();
}
- assert (newBlock != 0);
-
- return newBlock;
- }
-
- BlockType*
- allocate(size_type size)
- {
- const size_type theBytesNeeded = size * sizeof(BlockType);
-
- BlockType* pointer = (BlockType*)m_memoryManager->allocate(theBytesNeeded);
-
- assert(pointer != 0);
-
- return pointer;
+ assert(m_blockIndex.back() != 0);
}
void
@@ -446,7 +529,7 @@
while (iter != theBlockIndex.end())
{
- XalanDestroy(*m_memoryManager, *(*iter));
+ XalanDestroy(*m_memoryManager, *iter);
++iter;
}
@@ -458,13 +541,13 @@
m_memoryManager->deallocate(pointer);
}
- MemoryManager* m_memoryManager;
+ MemoryManager* m_memoryManager;
+
const size_type m_blockSize;
BlockIndexType m_blockIndex;
BlockIndexType m_freeBlockVector;
-private:
// These are not implemented
XalanDeque();
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 8 12:59:03 2008
New Revision: 724479
URL: http://svn.apache.org/viewvc?rev=724479&view=rev
Log:
Removed obsolete author tag. Used a typedef for more clarity and added some comments.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanList.hpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanList.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanList.hpp?rev=724479&r1=724478&r2=724479&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanList.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanList.hpp Mon Dec 8 12:59:03 2008
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-/**
- * @author Matthew Hoyt (mhoyt@ca.ibm.com)
- */
-
#if !defined(XALANLIST_HEADER_GUARD_1357924680)
#define XALANLIST_HEADER_GUARD_1357924680
@@ -188,24 +184,33 @@
};
typedef XalanListIteratorBase<XalanListIteratorTraits<value_type>, Node>
iterator;
-
typedef XalanListIteratorBase<XalanListConstIteratorTraits<value_type>, Node>
const_iterator;
-
+
#if defined(XALAN_HAS_STD_ITERATORS)
- typedef XALAN_STD_QUALIFIER reverse_iterator<iterator> reverse_iterator_;
+ typedef XALAN_STD_QUALIFIER reverse_iterator<iterator> reverse_iterator_;
typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator> const_reverse_iterator_;
#elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
+ typedef typename iterator::iterator_category iterator_category;
+
+ // This is a specific case for the Rogue Wave STL on Solaris.
typedef XALAN_STD_QUALIFIER reverse_iterator<
iterator,
- XALAN_STD_QUALIFIER bidirectional_iterator_tag,
- value_type> reverse_iterator_;
+ iterator_category,
+ value_type> reverse_iterator_;
+
typedef XALAN_STD_QUALIFIER reverse_iterator<
const_iterator,
- XALAN_STD_QUALIFIER bidirectional_iterator_tag,
- const value_type> const_reverse_iterator_;
+ iterator_category,
+ const value_type> const_reverse_iterator_;
#else
- typedef XALAN_STD_QUALIFIER reverse_iterator<iterator, value_type>
reverse_iterator_;
- typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator, value_type, const_reference>
const_reverse_iterator_;
+ typedef XALAN_STD_QUALIFIER reverse_iterator<
+ iterator,
+ value_type> reverse_iterator_;
+
+ typedef XALAN_STD_QUALIFIER reverse_iterator<
+ const_iterator,
+ value_type,
+ const_reference> const_reverse_iterator_;
#endif
typedef reverse_iterator_ reverse_iterator;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 8 12:57:46 2008
New Revision: 724478
URL: http://svn.apache.org/viewvc?rev=724478&view=rev
Log:
Created a typedef for more clarity. Added some comments.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanVector.hpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanVector.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanVector.hpp?rev=724478&r1=724477&r2=724478&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanVector.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanVector.hpp Mon Dec 8 12:57:46 2008
@@ -93,17 +93,25 @@
typedef XALAN_STD_QUALIFIER reverse_iterator<iterator> reverse_iterator_;
typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator> const_reverse_iterator_;
#elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
+ typedef XALAN_STD_QUALIFIER random_access_iterator_tag iterator_category;
+
+ // This is a specific case for the Rogue Wave STL on Solaris.
typedef XALAN_STD_QUALIFIER reverse_iterator<
iterator,
- XALAN_STD_QUALIFIER random_access_iterator_tag,
+ iterator_category,
value_type> reverse_iterator_;
typedef XALAN_STD_QUALIFIER reverse_iterator<
const_iterator,
- XALAN_STD_QUALIFIER random_access_iterator_tag,
+ iterator_category,
const value_type> const_reverse_iterator_;
#else
- typedef XALAN_STD_QUALIFIER reverse_iterator<iterator, value_type>
reverse_iterator_;
- typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator, value_type, const_reference>
const_reverse_iterator_;
+ typedef XALAN_STD_QUALIFIER reverse_iterator<
+ iterator,
+ value_type> reverse_iterator_;
+ typedef XALAN_STD_QUALIFIER reverse_iterator<
+ const_iterator,
+ value_type,
+ const_reference> const_reverse_iterator_;
#endif
typedef reverse_iterator_ reverse_iterator;
@@ -818,6 +826,8 @@
}
else if (m_size < theRHS.m_size)
{
+ // Insert the portion of theRHS that won't fit
+ // at the end...
theRHSCopyEnd =
theRHS.begin() + m_size;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 8 12:55:50 2008
New Revision: 724477
URL: http://svn.apache.org/viewvc?rev=724477&view=rev
Log:
Fixed comment in header file.
Modified:
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp?rev=724477&r1=724476&r2=724477&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp Mon Dec 8 12:55:50
2008
@@ -46,13 +46,11 @@
virtual
~XercesDOMSupport();
- // These interfaces are inherited from Resettable...
+ // These interfaces are inherited from DOMSupport...
virtual void
reset();
- // These interfaces are inherited from DOMSupport...
-
virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 8 11:18:06 2008
New Revision: 724452
URL: http://svn.apache.org/viewvc?rev=724452&view=rev
Log:
Return the error count from main() for the conf executable.
Modified:
xalan/c/trunk/Tests/Conf/conf.cpp
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp
Modified: xalan/c/trunk/Tests/Conf/conf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Conf/conf.cpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Conf/conf.cpp (original)
+++ xalan/c/trunk/Tests/Conf/conf.cpp Mon Dec 8 11:18:06 2008
@@ -596,6 +596,8 @@
logFile.close();
h.analyzeResults(xalan, resultsFile);
+
+ theResult = h.getFailureCount();
}
}
catch(const XalanDiagnosticMemoryManager::LockException&)
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Mon Dec 8 11:18:06 2008
@@ -810,7 +810,6 @@
// Todo: Need to determine if I should check for missing gold in these cases.
logfile.logCheckFail(data.testOrFile, actexp);
-
}
}
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp Mon Dec 8 11:18:06 2008
@@ -155,6 +155,12 @@
m_verbose = flag;
}
+ int
+ getFailureCount() const
+ {
+ return data.fail;
+ }
+
/**
* Utility method used to get test files from a specific directory.
* @returns a vector containing test files.
@@ -231,7 +237,6 @@
XalanDOMString&
getXercesVersion(XalanDOMString& theResult);
-
void
checkResults(
const XalanDOMString& outputFile,
@@ -255,7 +260,7 @@
const char* actual,
const char* expected,
const char* msg,
- XalanXMLFileReporter& logfile,
+ XalanXMLFileReporter& logfile,
const XalanDOMString& outputFile,
const XalanDOMString& goldFile,
MemoryManager& /* theManager */,
@@ -302,17 +307,18 @@
const XalanCompiledStylesheet* compiledSS,
const XalanSourceTreeDocument* dom,
const XSLTInputSource& goldInputSource,
- XalanXMLFileReporter& logfile);
+ XalanXMLFileReporter& logfile);
bool
compareSerializedResults(
const XalanDOMString& transformResult,
const XalanDOMString& goldInputSource);
+
/**
- * Utility method used to create a FormatterToXML FormatterListener.
- * This is required to DOM comparisions.
- * @returns a pointer to a FormatterListener.
- */
+ * Utility method used to create a FormatterToXML FormatterListener.
+ * This is required to DOM comparisions.
+ * @returns a pointer to a FormatterListener.
+ */
FormatterListener*
getXMLFormatter(
PrintWriter& resultWriter,
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Dec 8 11:16:33 2008
New Revision: 724450
URL: http://svn.apache.org/viewvc?rev=724450&view=rev
Log:
Removed obsolete author tags.
Modified:
xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp
xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp
xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp
xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp
Modified: xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp Mon Dec 8 11:16:33
2008
@@ -30,9 +30,6 @@
-/**
- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a>
- */
// Base class header file...
#include <xalanc/XPath/XPathConstructionContext.hpp>
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp Mon Dec 8 11:16:33 2008
@@ -18,11 +18,6 @@
#if !defined(XALAN_ELEMCOPYOF_HEADER_GUARD)
#define XALAN_ELEMCOPYOF_HEADER_GUARD
-/**
- * @author David Bertoni (david_n_bertoni@us.ibm.com)
- * @author Matthew Hoyt (mhoyt@ca.ibm.com)
- */
-
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
Modified: xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp Mon Dec 8 11:16:33 2008
@@ -54,8 +54,6 @@
/**
* Class handling an extension namespace for XPath. Provides functions
* to test a function's existence and call a function
- *
- * @author Sanjiva Weerawarana (sanjiva@watson.ibm.com)
*/
class XALAN_XSLT_EXPORT ExtensionFunctionHandler
{
Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp Mon Dec 8 11:16:33 2008
@@ -19,14 +19,6 @@
#if !defined(XALAN_NODESORTKEY_HEADER_GUARD)
#define XALAN_NODESORTKEY_HEADER_GUARD
-/**
- *
- * @author Scott Boag (scott_boag@lotus.com)
- * @author David N. Bertoni (david_n_bertoni@lotus.com)
- */
-
-
-
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp Mon Dec 8 11:16:33 2008
@@ -15,13 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- *
- * @author Scott Boag (scott_boag@lotus.com)
- * @author David N. Bertoni (david_n_bertoni@lotus.com)
- */
-
-
// Class header file.
#include "NodeSorter.hpp"
Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp Mon Dec 8 11:16:33 2008
@@ -18,12 +18,6 @@
#if !defined(XALAN_NODESORTER_HEADER_GUARD)
#define XALAN_NODESORTER_HEADER_GUARD
-/**
- * @author David N. Bertoni (david_n_bertoni@lotus.com)
- */
-
-
-
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Nov 29 12:28:09 2008
New Revision: 721709
URL: http://svn.apache.org/viewvc?rev=721709&view=rev
Log:
Reduced optimization level on PA-RISC because of excessive memory usage.
Modified:
xalan/c/trunk/runConfigure
Modified: xalan/c/trunk/runConfigure
URL: http://svn.apache.org/viewvc/xalan/c/trunk/runConfigure?rev=721709&r1=721708&r2=721709&view=diff
==============================================================================
--- xalan/c/trunk/runConfigure (original)
+++ xalan/c/trunk/runConfigure Sat Nov 29 12:28:09 2008
@@ -365,7 +365,11 @@
elif test $platform = "linux"; then
debugflag="-O3 -DNDEBUG";
elif test $cppcompiler = "aCC"; then
- debugflag="+O3 -DNDEBUG";
+ if test $platform = "hp-11-ia64"; then
+ debugflag="+O3 -DNDEBUG";
+ else
+ debugflag="+O2 -DNDEBUG";
+ fi
else
debugflag="-O -DNDEBUG";
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Fri Nov 28 13:03:31 2008
New Revision: 721561
URL: http://svn.apache.org/viewvc?rev=721561&view=rev
Log:
Cleaned up pthread options to fix 64-bit build on Solaris x86. Cleaned up old 64-bit defines
and removed unnecessary 32-bit build options.
Modified:
xalan/c/trunk/runConfigure
Modified: xalan/c/trunk/runConfigure
URL: http://svn.apache.org/viewvc/xalan/c/trunk/runConfigure?rev=721561&r1=721560&r2=721561&view=diff
==============================================================================
--- xalan/c/trunk/runConfigure (original)
+++ xalan/c/trunk/runConfigure Fri Nov 28 13:03:31 2008
@@ -385,26 +385,24 @@
# freebsd | netbsd | openbsd | irix | os390 | os400 | tru64 | macosx
#
if test $bitsToBuild = 64; then
- bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
- bitstobuildLink=" "
+ bitstobuildDefines=""
+ bitstobuildLink=""
if test $platform; then
case $platform in
solaris)
- bitstobuildDefines=" $bitstobuildDefines -xarch=v9 "
+ bitstobuildDefines=" -xarch=v9 "
bitstobuildLink=" -xarch=v9 " ;;
solaris-x86)
- bitstobuildDefines=" $bitstobuildDefines -m64 "
+ bitstobuildDefines=" -m64 "
bitstobuildLink=" -m64 " ;;
aix)
- bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 " ;;
+ bitstobuildDefines=" -q64 -qwarn64 " ;;
hp-11)
- bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
+ bitstobuildDefines=" +DA2.0W "
bitstobuildLink=" +DA2.0W " ;;
hp-11-ia64)
- bitstobuildDefines=" $bitstobuildDefines +DD64 "
+ bitstobuildDefines=" +DD64 "
bitstobuildLink=" +DD64 " ;;
- linux)
- bitstobuildDefines=" $bitstobuildDefines " ;;
*)
;;
esac
@@ -412,24 +410,6 @@
elif test $bitsToBuild = 32; then
bitstobuildDefines=""
bitstobuildLink=""
- if test $platform; then
- case $platform in
- solaris)
- ;;
- aix)
- ;;
- hp-11)
- bitstobuildDefines="+DAportable "
- ;;
- hp-11-ia64)
- bitstobuildDefines="+DD32 "
- ;;
- linux)
- ;;
- *)
- ;;
- esac
- fi
else
echo "I do not recognize the bitsToBuild '$bitsToBuild'. Please type '${0} -h' for help."
exit ${ERROR_EXIT_CODE};
@@ -629,7 +609,7 @@
threadingDefines="-D_OPEN_THREADS"
;;
- solaris)
+ solaris*)
if test $ccompiler = "gcc"; then
# GCC on Solaris uses "-pthreads" instead of
# "-pthread"
@@ -637,7 +617,6 @@
threadingLibs=$gccThreadingLibs
else
threadingDefines="-mt"
- threadingLibs="-lpthread"
fi
;;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Tue Nov 25 14:46:13 2008
New Revision: 720636
URL: http://svn.apache.org/viewvc?rev=720636&view=rev
Log:
Initial configuration changes for OpenBSD port.
Modified:
xalan/c/trunk/Makefile.incl.in
xalan/c/trunk/configure
xalan/c/trunk/configure.in
xalan/c/trunk/runConfigure
Modified: xalan/c/trunk/Makefile.incl.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Makefile.incl.in?rev=720636&r1=720635&r2=720636&view=diff
==============================================================================
--- xalan/c/trunk/Makefile.incl.in (original)
+++ xalan/c/trunk/Makefile.incl.in Tue Nov 25 14:46:13 2008
@@ -328,6 +328,33 @@
MAKE_SHARED_LOC=$(MAKE_SHARED)
endif
+#=============== OPENBSD SPECIFIC OPTIONS ======================
+
+ifeq ($(PLATFORM), OPENBSD)
+
+ SUPPORTED = TRUE
+ ALLLIBS = ${LIBS} -L/usr/local/lib
+ SHLIBSUFFIX=.so
+ PIC_OPTION = -fPIC
+
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} ${PIC_OPTION} ${WCSTOMBS}
+
+ # We need the ICU library if we are using the ICUBridge
+ ifdef XALAN_USE_ICU
+ LD_RPATH_PRE = -Wl,-rpath,
+ PLATFORM_LIB_LINK_OPTIONS = $(LD_RPATH_PRE)${ICUROOT}/lib
+ PLATFORM_LIB_LINK_OPTIONS += -licuuc -licudata
+ ALLLIBS += -L${ICUROOT}
+ endif
+
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = $(CXX) $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
+ LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
+
+ MAKE_SHARED_LOC=$(MAKE_SHARED)
+endif
+
#=============== HPUX SPECIFIC OPTIONS =========================
Modified: xalan/c/trunk/configure
URL: http://svn.apache.org/viewvc/xalan/c/trunk/configure?rev=720636&r1=720635&r2=720636&view=diff
==============================================================================
--- xalan/c/trunk/configure (original)
+++ xalan/c/trunk/configure Tue Nov 25 14:46:13 2008
@@ -2818,6 +2818,7 @@
*-*-linux*) platform=LINUX ;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-netbsd*) platform=NETBSD ;;
+ *-*-openbsd*) platform=OPENBSD ;;
*-*-irix*) platform=IRIX ;;
*-*-aix*) platform=AIX ;;
ia64-hp*) platform=HPUX ; osver=HPUX11 ; osvariant=IA64;;
Modified: xalan/c/trunk/configure.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/configure.in?rev=720636&r1=720635&r2=720636&view=diff
==============================================================================
--- xalan/c/trunk/configure.in (original)
+++ xalan/c/trunk/configure.in Tue Nov 25 14:46:13 2008
@@ -46,6 +46,7 @@
*-*-linux*) platform=LINUX ;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-netbsd*) platform=NETBSD ;;
+ *-*-openbsd*) platform=OPENBSD ;;
*-*-irix*) platform=IRIX ;;
*-*-aix*) platform=AIX ;;
ia64-hp*) platform=HPUX ; osver=HPUX11 ; osvariant=IA64;;
Modified: xalan/c/trunk/runConfigure
URL: http://svn.apache.org/viewvc/xalan/c/trunk/runConfigure?rev=720636&r1=720635&r2=720636&view=diff
==============================================================================
--- xalan/c/trunk/runConfigure (original)
+++ xalan/c/trunk/runConfigure Tue Nov 25 14:46:13 2008
@@ -152,7 +152,7 @@
echo "runConfigure: Helper script to run \"configure\" for one of the supported platforms"
echo "Usage: runConfigure \"options\""
echo " where options may be any of the following:"
- echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'netbsd', 'solaris'
'solaris-x86',
+ echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'netbsd', 'openbsd',
'solaris' 'solaris-x86',
'hp-10', 'hp-11', 'hp-11-ia64', 'irix', 'tru64', 'macosx', 'os390', 'os400',
'cygwin' 'mingw-msys')"
echo " -c <C compiler name> (e.g. gcc, cc, xlc)"
echo " -x <C++ compiler name> (e.g. g++, CC, xlC)"
@@ -343,7 +343,7 @@
#
case $platform in
- aix | linux | freebsd | netbsd | solaris | solaris-x86 | hp-11 | hp-11-ia64 | irix | tru64
| macosx | os390 | os400 | cygwin | mingw-msys)
+ aix | linux | freebsd | netbsd | openbsd | solaris | solaris-x86 | hp-11 | hp-11-ia64
| irix | tru64 | macosx | os390 | os400 | cygwin | mingw-msys)
# platform has been recognized
;;
*)
@@ -382,7 +382,7 @@
#
# aix | linux | hp-11 | hp-11-ia64 | solaris |
-# freebsd | netbsd | irix | openserver | unixware | os390 | os400 | ptx | tru64 | macosx
+# freebsd | netbsd | openbsd | irix | os390 | os400 | tru64 | macosx
#
if test $bitsToBuild = 64; then
bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Thu Nov 20 11:38:30 2008
New Revision: 719336
URL: http://svn.apache.org/viewvc?rev=719336&view=rev
Log:
Reverted previous change for Mingw, since it breaks other platforms.
Modified:
xalan/c/trunk/src/xalanc/Makefile.in
xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in
Modified: xalan/c/trunk/src/xalanc/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Makefile.in?rev=719336&r1=719335&r2=719336&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Makefile.in Thu Nov 20 11:38:30 2008
@@ -237,9 +237,9 @@
mv *.x ${XSL_LIB_DIR}
else
rm -f $(XSL_LIB_DIR)/$(LINK_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
+ $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
rm -f $(XSL_LIB_DIR)/$(SO_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
+ $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
endif ## OS390
endif ## OS390BATCH
@@ -254,9 +254,9 @@
$(INSTALL_PROGRAM) $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)
ifneq ($(PLATFORM), OS390)
rm -f $(DESTDIR)/$(libdir)/$(LINK_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
+ $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
rm -f $(DESTDIR)/$(libdir)/$(SO_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
+ $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
endif ## OS390
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
for hdir in $(ALL_HEADERS_DIRS); do \
Modified: xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in?rev=719336&r1=719335&r2=719336&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in Thu Nov 20 11:38:30 2008
@@ -35,12 +35,12 @@
$(MAKE_SHARED_LOC) $(EXTRA_LOC_LINK_OPTIONS) $^ -o $@
ifneq ($(PLATFORM), OS390)
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
+ $(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
$(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
else
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LOC_LIB) \
+ $(LN) -fs $(LOC_LIB) \
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Wed Nov 19 22:47:57 2008
New Revision: 719183
URL: http://svn.apache.org/viewvc?rev=719183&view=rev
Log:
Makefile fixes for Mingw.
Modified:
xalan/c/trunk/src/xalanc/Makefile.in
xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in
Modified: xalan/c/trunk/src/xalanc/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Makefile.in?rev=719183&r1=719182&r2=719183&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Makefile.in Wed Nov 19 22:47:57 2008
@@ -237,9 +237,9 @@
mv *.x ${XSL_LIB_DIR}
else
rm -f $(XSL_LIB_DIR)/$(LINK_NAME) && \
- $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
+ $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
rm -f $(XSL_LIB_DIR)/$(SO_NAME) && \
- $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
+ $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
endif ## OS390
endif ## OS390BATCH
@@ -254,9 +254,9 @@
$(INSTALL_PROGRAM) $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)
ifneq ($(PLATFORM), OS390)
rm -f $(DESTDIR)/$(libdir)/$(LINK_NAME) && \
- $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
+ $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
rm -f $(DESTDIR)/$(libdir)/$(SO_NAME) && \
- $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
+ $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
endif ## OS390
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
for hdir in $(ALL_HEADERS_DIRS); do \
Modified: xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in?rev=719183&r1=719182&r2=719183&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in Wed Nov 19 22:47:57 2008
@@ -35,12 +35,12 @@
$(MAKE_SHARED_LOC) $(EXTRA_LOC_LINK_OPTIONS) $^ -o $@
ifneq ($(PLATFORM), OS390)
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX) && \
- $(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
+ $(LN) -fs $(XSL_LIB_DIR)/$(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
$(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
else
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER) && \
- $(LN) -fs $(LOC_LIB) \
+ $(LN) -fs $(XSL_LIB_DIR)/$(LOC_LIB) \
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Wed Nov 19 14:38:25 2008
New Revision: 719104
URL: http://svn.apache.org/viewvc?rev=719104&view=rev
Log:
Fixes for Visual Studio 6.
Modified:
xalan/c/trunk/Tests/Conf/conf.cpp
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp
Modified: xalan/c/trunk/Tests/Conf/conf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Conf/conf.cpp?rev=719104&r1=719103&r2=719104&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Conf/conf.cpp (original)
+++ xalan/c/trunk/Tests/Conf/conf.cpp Wed Nov 19 14:38:25 2008
@@ -145,6 +145,9 @@
"output22.xsl",
#endif
+ // Excluded because it outputs ISO-2022-JP, and not all platforms support this encoding.
+ "output23.xsl",
+
// These sort tests are disabled because the ICU implements a more recent version of
the
// the Unicode collation algorithm, so we won't match the Java results.
"sort08.xsl",
@@ -206,9 +209,6 @@
// Excluded because it outputs EBCDIC-CP-IT, and not all platforms support this encoding.
"output22.xsl",
- // Excluded because it outputs ISO-2022-JP, and not all platforms support this encoding.
- "output23.xsl",
-
// Excluded because it outputs HTML, which cannot be parsed. Text comparison fails because
// it try to use SHIFT_JIS for the output encoding, which not all platforms support.
"output73.xsl",
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=719104&r1=719103&r2=719104&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Wed Nov 19 14:38:25 2008
@@ -855,7 +855,7 @@
XalanDestroy(
getMemoryManager(),
- theFormatter);
+ *theFormatter);
XalanSourceTreeDOMSupport domSupport;
XalanSourceTreeParserLiaison parserLiaison(domSupport, getMemoryManager());
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp?rev=719104&r1=719103&r2=719104&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp Wed Nov 19 14:38:25 2008
@@ -76,9 +76,9 @@
MemoryManager& theManager,
XalanMessageLoader* p)
{
- assert (p != 0);
+ assert(p != 0);
- XalanDestroy(theManager, p);
+ XalanDestroy(theManager, *p);
}
};
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=719104&r1=719103&r2=719104&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Wed Nov 19 14:38:25 2008
@@ -194,7 +194,7 @@
XalanDOMChar* p = &theGuard.back();
// Leave a null-terminator.
- --p;
+ *p-- = 0;
for (XalanDOMString::size_type i = 0, ix = len - 1; i < len && p >
buffer; i++, ix--)
{
Modified: xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp?rev=719104&r1=719103&r2=719104&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp Wed Nov 19 14:38:25 2008
@@ -182,7 +182,7 @@
XalanDestroy(
m_memoryManager,
- m_stylesheetExecutionContext);
+ *m_stylesheetExecutionContext);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Propchange: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Wed Nov 19 12:07:05 2008
@@ -853,7 +853,9 @@
theTreeWalker.traverse(dom);
- destroyObjWithMemMgr(theFormatter, getMemoryManager());
+ XalanDestroy(
+ getMemoryManager(),
+ theFormatter);
XalanSourceTreeDOMSupport domSupport;
XalanSourceTreeParserLiaison parserLiaison(domSupport, getMemoryManager());
Modified: xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.hpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.hpp Wed Nov 19 12:07:05 2008
@@ -33,7 +33,6 @@
#include "xalanc/Include/XalanAutoPtr.hpp"
-#include "xalanc/Include/XalanMemMgrHelper.hpp"
#include "xalanc/Include/XalanMap.hpp"
#include "xalanc/Include/XalanVector.hpp"
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctor.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctor.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctor.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctor.cpp Wed Nov 19 12:07:05 2008
@@ -23,7 +23,6 @@
#include "ICUBridge.hpp"
#include "ICUBridgeCollationCompareFunctorImpl.hpp"
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
XALAN_CPP_NAMESPACE_BEGIN
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp Wed Nov 19 12:07:05 2008
@@ -114,21 +114,23 @@
}
}
-ICUBridgeCollationCompareFunctorImpl*
-ICUBridgeCollationCompareFunctorImpl::create (MemoryManager& theManager , bool fCacheCollators)
-{
- typedef ICUBridgeCollationCompareFunctorImpl ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
- new (theResult) ThisType(theManager, fCacheCollators);
+
+ICUBridgeCollationCompareFunctorImpl*
+ICUBridgeCollationCompareFunctorImpl::create(
+ MemoryManager& theManager,
+ bool fCacheCollators)
+{
+ ICUBridgeCollationCompareFunctorImpl* theInstance;
+
+ return XalanConstruct(
+ theManager,
+ theInstance,
+ theManager,
+ fCacheCollators);
+}
- theGuard.release();
- return theResult;
-}
ICUBridgeCollationCompareFunctorImpl::~ICUBridgeCollationCompareFunctorImpl()
{
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp Wed Nov 19 12:07:05 2008
@@ -60,13 +60,12 @@
ICUFormatNumberFunctor*
ICUFormatNumberFunctor::create(MemoryManager& theManager)
{
- typedef ICUFormatNumberFunctor ThisType;
+ typedef ICUFormatNumberFunctor ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theManager);
theGuard.release();
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp Wed Nov 19 12:07:05 2008
@@ -255,7 +255,7 @@
const DFAutoPtrType m_defaultDecimalFormat;
- MemoryManager& m_memoryManager;
+ MemoryManager& m_memoryManager;
};
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatFactory.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatFactory.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatFactory.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatFactory.cpp Wed Nov 19 12:07:05 2008
@@ -45,17 +45,9 @@
XalanNumberFormat*
ICUXalanNumberFormatFactory::create()
{
- typedef ICUXalanNumberFormatProxy ThisType;
+ ICUXalanNumberFormatProxy* theInstance;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( m_memoryManager , (ThisType*)m_memoryManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(m_memoryManager);
-
- theGuard.release();
-
- return theResult;
+ return XalanConstruct(m_memoryManager, theInstance, m_memoryManager);
}
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp Wed Nov 19 12:07:05 2008
@@ -30,8 +30,6 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
-#include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
-
#include "ICUBridge.hpp"
@@ -41,7 +39,7 @@
-ICUXalanNumberFormatProxy::ICUXalanNumberFormatProxy(MemoryManager& theManager) :
+ICUXalanNumberFormatProxy::ICUXalanNumberFormatProxy(MemoryManager& theManager) :
XalanNumberFormat(theManager),
m_decimalFormat(0)
{
Modified: xalan/c/trunk/src/xalanc/Include/XalanAutoPtr.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanAutoPtr.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanAutoPtr.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanAutoPtr.hpp Wed Nov 19 12:07:05 2008
@@ -47,7 +47,7 @@
}
XalanAutoPtr(const XalanAutoPtr<Type>& theSource) :
- m_pointer(((XalanAutoPtr<Type>&)theSource).release())
+ m_pointer(const_cast<XalanAutoPtr<Type>&>(theSource).release())
{
}
Modified: xalan/c/trunk/src/xalanc/Include/XalanMemMgrAutoPtr.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanMemMgrAutoPtr.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanMemMgrAutoPtr.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanMemMgrAutoPtr.hpp Wed Nov 19 12:07:05 2008
@@ -42,9 +42,7 @@
XALAN_USING_XERCES(MemoryManager)
// An auto_ptr-like class that supports the MemoryManager class.
-template<
- class Type,
- bool toCallDestructor = true>
+template<class Type>
class XalanMemMgrAutoPtr
{
public:
@@ -54,6 +52,7 @@
class MemMgrAutoPtrData : public AutoPtrPairType
{
public:
+
MemMgrAutoPtrData():
AutoPtrPairType(0,0)
{
@@ -66,7 +65,7 @@
{
invariants();
}
-
+
bool
isInitilized()const
{
@@ -78,12 +77,9 @@
{
invariants();
- if ( isInitilized() )
+ if (isInitilized())
{
- if ( toCallDestructor )
- {
- this->second->~Type();
- }
+ this->second->~Type();
this->first->deallocate(this->second);
}
@@ -91,8 +87,8 @@
void
reset(
- MemoryManager* memoryManager ,
- Type* dataPointer)
+ MemoryManager* memoryManager,
+ Type* dataPointer)
{
invariants();
@@ -127,13 +123,13 @@
{
}
- XalanMemMgrAutoPtr(const XalanMemMgrAutoPtr<Type, toCallDestructor>& theSource) :
- m_pointerInfo(((XalanMemMgrAutoPtr<Type>&)theSource).release())
+ XalanMemMgrAutoPtr(const XalanMemMgrAutoPtr<Type>& theSource) :
+ m_pointerInfo(const_cast<XalanMemMgrAutoPtr<Type>&>(theSource).release())
{
}
- XalanMemMgrAutoPtr<Type,toCallDestructor>&
- operator=(XalanMemMgrAutoPtr<Type,toCallDestructor>& theRHS)
+ XalanMemMgrAutoPtr<Type>&
+ operator=(XalanMemMgrAutoPtr<Type>& theRHS)
{
if (this != &theRHS)
{
Modified: xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp Wed Nov 19 12:07:05 2008
@@ -298,6 +298,74 @@
class Type,
class Param1Type,
class Param2Type,
+ class Param3Type,
+ class Param4Type>
+Type*
+XalanConstruct(
+ MemoryManager& theMemoryManager,
+ Type*& theInstance,
+ const Param1Type* theParam1,
+ const Param2Type* theParam2,
+ const Param3Type* theParam3,
+ Param4Type& theParam4)
+{
+ XalanAllocationGuard theGuard(
+ theMemoryManager,
+ sizeof(Type));
+
+ theInstance =
+ new (theGuard.get()) Type(theParam1, theParam2, theParam3, theParam4);
+
+ theGuard.release();
+
+ return theInstance;
+}
+
+
+
+template<
+ class Type,
+ class Param1Type,
+ class Param2Type,
+ class Param3Type,
+ class Param4Type,
+ class Param5Type,
+ class Param6Type>
+Type*
+XalanConstruct(
+ MemoryManager& theMemoryManager,
+ Type*& theInstance,
+ const Param1Type* theParam1,
+ const Param2Type* theParam2,
+ const Param3Type* theParam3,
+ const Param4Type* theParam4,
+ const Param5Type* theParam5,
+ Param6Type& theParam6)
+{
+ XalanAllocationGuard theGuard(
+ theMemoryManager,
+ sizeof(Type));
+
+ theInstance =
+ new (theGuard.get()) Type(
+ theParam1,
+ theParam2,
+ theParam3,
+ theParam4,
+ theParam5,
+ theParam6);
+
+ theGuard.release();
+
+ return theInstance;
+}
+
+
+
+template<
+ class Type,
+ class Param1Type,
+ class Param2Type,
class Param3Type>
Type*
XalanConstruct(
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp Wed Nov 19 12:07:05 2008
@@ -392,7 +392,7 @@
m_AttributeVector.reserve(eDefaultVectorSize);
}
- typedef XalanMemMgrAutoPtr<AttributeVectorEntry,true> AutoPtr;
+ typedef XalanMemMgrAutoPtr<AttributeVectorEntry> AutoPtr;
AutoPtr theEntry(getMemoryManager(), getNewEntry(name, type, value));
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntry.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntry.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntry.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntry.hpp Wed Nov 19 12:07:05 2008
@@ -45,7 +45,7 @@
const XMLChVectorType& theName,
const XMLChVectorType& theValue,
const XMLChVectorType& theType,
- MemoryManager& theManager) :
+ MemoryManager& theManager) :
m_Name(theName,theManager),
m_Value(theValue,theManager),
m_Type(theType,theManager)
@@ -53,10 +53,10 @@
}
AttributeVectorEntry(
- const XMLCh* theName,
- const XMLCh* theValue,
- const XMLCh* theType,
- MemoryManager& theManager) :
+ const XMLCh* theName,
+ const XMLCh* theValue,
+ const XMLCh* theType,
+ MemoryManager& theManager) :
m_Name(theName, theName + length(theName) + 1, theManager),
m_Value(theValue, theValue + length(theValue) + 1, theManager),
m_Type(theType, theType + length(theType) + 1, theManager)
@@ -71,22 +71,21 @@
}
static AttributeVectorEntry*
- create( const XMLCh* theName,
+ create(
+ const XMLCh* theName,
const XMLCh* theValue,
const XMLCh* theType,
- MemoryManager& theManager)
+ MemoryManager& theManager)
{
- typedef AttributeVectorEntry ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theName, theValue, theType, theManager);
-
- theGuard.release();
+ AttributeVectorEntry* theInstance;
- return theResult;
+ return XalanConstruct(
+ theManager,
+ theInstance,
+ theName,
+ theValue,
+ theType,
+ theManager);
}
virtual
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntryExtended.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntryExtended.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntryExtended.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntryExtended.hpp Wed Nov 19 12:07:05 2008
@@ -43,10 +43,18 @@
const XMLChVectorType& theType,
const XMLChVectorType& theURI ,
const XMLChVectorType& theLocalName,
- MemoryManager& theManager) :
- AttributeVectorEntry(theName, theValue, theType, theManager),
- m_uri(theURI, theManager),
- m_localName(theLocalName, theManager)
+ MemoryManager& theManager) :
+ AttributeVectorEntry(
+ theName,
+ theValue,
+ theType,
+ theManager),
+ m_uri(
+ theURI,
+ theManager),
+ m_localName(
+ theLocalName,
+ theManager)
{
}
@@ -56,10 +64,20 @@
const XMLCh* theType,
const XMLCh* theURI,
const XMLCh* theLocalName,
- MemoryManager& theManager) :
- AttributeVectorEntry(theName, theValue, theType, theManager),
- m_uri(theURI, theURI + length(theURI) + 1, theManager),
- m_localName(theLocalName, theLocalName + length(theLocalName) + 1,theManager)
+ MemoryManager& theManager) :
+ AttributeVectorEntry(
+ theName,
+ theValue,
+ theType,
+ theManager),
+ m_uri(
+ theURI,
+ theURI + length(theURI) + 1,
+ theManager),
+ m_localName(
+ theLocalName,
+ theLocalName + length(theLocalName) + 1,
+ theManager)
{
}
@@ -68,13 +86,16 @@
const XMLCh* theValue,
const XMLCh* theType,
MemoryManager& theManager) :
- AttributeVectorEntry(theName, theValue, theType,theManager),
+ AttributeVectorEntry(
+ theName,
+ theValue,
+ theType,theManager),
m_uri(theManager),
m_localName(theManager)
{
}
- AttributeVectorEntryExtended(MemoryManager& theManager) :
+ AttributeVectorEntryExtended(MemoryManager& theManager) :
AttributeVectorEntry(theManager),
m_uri(theManager),
m_localName(theManager)
@@ -88,19 +109,19 @@
const XMLCh* theType,
const XMLCh* theURI,
const XMLCh* theLocalName,
- MemoryManager& theManager)
+ MemoryManager& theManager)
{
- typedef AttributeVectorEntryExtended ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theName, theValue, theType, theURI, theLocalName, theManager);
-
- theGuard.release();
+ AttributeVectorEntryExtended* theInstance;
- return theResult;
+ return XalanConstruct(
+ theManager,
+ theInstance,
+ theName,
+ theValue,
+ theType,
+ theURI,
+ theLocalName,
+ theManager);
}
virtual
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp Wed Nov 19 12:07:05 2008
@@ -59,8 +59,9 @@
-AttributesImpl::AttributesImpl(const AttributesImpl& theSource,
- MemoryManager& theManager) :
+AttributesImpl::AttributesImpl(
+ const AttributesImpl& theSource,
+ MemoryManager& theManager) :
AttributesType(),
m_attributesVector(theManager),
m_cacheVector(theManager)
@@ -495,7 +496,7 @@
m_attributesVector.reserve(eDefaultVectorSize);
}
- typedef XalanMemMgrAutoPtr<AttributeVectorEntryExtended,true> AutoPtr;
+ typedef XalanMemMgrAutoPtr<AttributeVectorEntryExtended> AutoPtr;
AutoPtr theEntry(getMemoryManager(), getNewEntry(name, type, value, uri, localName));
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp Wed Nov 19 12:07:05 2008
@@ -28,7 +28,7 @@
#include <utility>
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
+
#include <xalanc/Include/XalanVector.hpp>
#include <xalanc/Include/XalanList.hpp>
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp Wed Nov 19 12:07:05 2008
@@ -47,20 +47,20 @@
XalanFStreamOutputStream*
XalanFStreamOutputStream::create(
- FILE* theFileHandle,
+ FILE* theFileHandle,
MemoryManager& theManager,
- size_type theBufferSize)
+ size_type theBufferSize)
{
- typedef XalanFStreamOutputStream ThisType;
+ typedef XalanFStreamOutputStream ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theFileHandle,
+ theManager,
+ theBufferSize);
- new (theResult) ThisType(theFileHandle,
- theManager,
- theBufferSize);
-
theGuard.release();
return theResult;
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Wed Nov 19 12:07:05 2008
@@ -223,29 +223,31 @@
#endif
}
+
+
XalanFileOutputStream*
XalanFileOutputStream::create(
const XalanDOMString& theFileName,
- MemoryManager& theManager,
+ MemoryManager& theManager,
size_type theBufferSize)
{
- typedef XalanFileOutputStream ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XalanFileOutputStream ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
theFileName,
theManager,
theBufferSize);
-
theGuard.release();
return theResult;
}
+
+
XalanFileOutputStream::~XalanFileOutputStream()
{
#if defined(XALAN_WINDOWS)
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp Wed Nov 19 12:07:05 2008
@@ -23,10 +23,14 @@
#include "xalanc/PlatformSupport/PlatformSupportDefinitions.hpp"
-#include "xalanc/XalanDOM/XalanDOMString.hpp"
#include "xalanc/Include/XalanMemMgrAutoPtr.hpp"
-#include "xalanc/Include/XalanMemMgrHelper.hpp"
+
+
+
+#include "xalanc/XalanDOM/XalanDOMString.hpp"
+
+
#include "LocalMsgIndex.hpp"
@@ -49,14 +53,14 @@
class XalanMessageLoaderCreateFunct
{
public:
+
Type*
operator()(MemoryManager& theManager)
{
- XalanMemMgrAutoPtr<Type, false> theGuard( theManager , (Type*)theManager.allocate(sizeof(Type)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(Type)));
- Type* theResult = theGuard.get();
-
- new (theResult) Type(theManager);
+ Type* const theResult =
+ new (theGuard.get()) Type(theManager);
theGuard.release();
@@ -71,10 +75,10 @@
operator()(
MemoryManager& theManager,
XalanMessageLoader* p)
- {
- assert ( p != 0);
+ {
+ assert (p != 0);
- destroyObjWithMemMgr(p, theManager);
+ XalanDestroy(theManager, p);
}
};
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Wed Nov 19 12:07:05 2008
@@ -19,9 +19,6 @@
-#include <xalanc/Include/XalanMemMngArrayAllocate.hpp>
-
-
#include <xalanc/Include/STLHelper.hpp>
@@ -189,18 +186,15 @@
// Add two, so we leave one byte at the beginning as empty space
const XalanDOMString::size_type bufsize = len + len / m_groupingSize + 2;
- typedef XalanMemMngArrayAllocate<XalanDOMChar> XalanDOMCharHeapAllocator;
-
- XalanDOMChar* const buffer = XalanDOMCharHeapAllocator::allocate( bufsize,
- result.getMemoryManager());
+ XalanVector<XalanDOMChar> theGuard(result.getMemoryManager());
- XalanMemMgrAutoPtrArray<XalanDOMChar> theGuard(result.getMemoryManager(),
- buffer,
- bufsize);
+ theGuard.resize(bufsize);
- XalanDOMChar* p = buffer + bufsize - 1;
+ XalanDOMChar* const buffer = &*theGuard.begin();
+ XalanDOMChar* p = &theGuard.back();
- *p-- = 0; // null terminate
+ // Leave a null-terminator.
+ --p;
for (XalanDOMString::size_type i = 0, ix = len - 1; i < len && p > buffer; i++, ix--)
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp Wed Nov 19 12:07:05 2008
@@ -46,26 +46,32 @@
m_flushWideChars(false)
{
}
+
+
+
XalanOutputStreamPrintWriter*
XalanOutputStreamPrintWriter::create(
XalanOutputStream& theOutputStream,
bool fAutoFlush)
{
- typedef XalanOutputStreamPrintWriter ThisType;
+ typedef XalanOutputStreamPrintWriter ThisType;
- MemoryManager& theManager = theOutputStream.getMemoryManager();
+ MemoryManager& theManager = theOutputStream.getMemoryManager();
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theOutputStream, fAutoFlush);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theOutputStream,
+ fAutoFlush);
theGuard.release();
return theResult;
}
+
+
XalanOutputStreamPrintWriter::~XalanOutputStreamPrintWriter()
{
flush();
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp Wed Nov 19 12:07:05 2008
@@ -81,13 +81,14 @@
StreamType& theOutputStream,
MemoryManager& theManager)
{
- typedef XalanStdOutputStream ThisType;
+ typedef XalanStdOutputStream ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theOutputStream, theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theOutputStream,
+ theManager);
theGuard.release();
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp Wed Nov 19 12:07:05 2008
@@ -37,29 +37,37 @@
-XalanToXercesTranscoderWrapper::XalanToXercesTranscoderWrapper(MemoryManager& theManager, XMLTranscoderType& theTranscoder) :
+XalanToXercesTranscoderWrapper::XalanToXercesTranscoderWrapper(
+ MemoryManager& theManager,
+ XMLTranscoderType& theTranscoder) :
XalanOutputTranscoder(theManager),
m_transcoder(&theTranscoder)
{
}
+
+
XalanToXercesTranscoderWrapper*
-XalanToXercesTranscoderWrapper::create(MemoryManager& theManager, XMLTranscoderType& theTranscoder)
+XalanToXercesTranscoderWrapper::create(
+ MemoryManager& theManager,
+ XMLTranscoderType& theTranscoder)
{
- typedef XalanToXercesTranscoderWrapper ThisType;
+ typedef XalanToXercesTranscoderWrapper ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ theTranscoder);
- new (theResult) ThisType(theManager, theTranscoder);
-
- theGuard.release();
+ theGuard.release();
return theResult;
}
+
XalanToXercesTranscoderWrapper::~XalanToXercesTranscoderWrapper()
{
delete m_transcoder;
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp Wed Nov 19 12:07:05 2008
@@ -28,28 +28,30 @@
-XalanUTF16Transcoder::XalanUTF16Transcoder(MemoryManager& theManager) :
+XalanUTF16Transcoder::XalanUTF16Transcoder(MemoryManager& theManager) :
XalanOutputTranscoder(theManager)
{
}
+
+
XalanUTF16Transcoder*
XalanUTF16Transcoder::create(MemoryManager& theManager)
{
- typedef XalanUTF16Transcoder ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XalanUTF16Transcoder ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theManager);
- theGuard.release();
+ theGuard.release();
- return theResult;
+ return theResult;
}
+
XalanUTF16Transcoder::~XalanUTF16Transcoder()
{
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp Wed Nov 19 12:07:05 2008
@@ -66,7 +66,7 @@
int indent,
bool escapeURLs,
bool omitMetaTag,
- MemoryManager& theManager) :
+ MemoryManager& theManager) :
FormatterToXML(
writer,
s_emptyString,
@@ -105,7 +105,7 @@
FormatterToHTML*
FormatterToHTML::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
Writer& writer,
const XalanDOMString& encoding,
const XalanDOMString& mediaType,
@@ -116,25 +116,24 @@
bool escapeURLs,
bool omitMetaTag)
{
- typedef FormatterToHTML ThisType;
+ typedef FormatterToHTML ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ writer,
+ encoding,
+ mediaType,
+ doctypeSystem,
+ doctypePublic,
+ doIndent,
+ indent,
+ escapeURLs,
+ omitMetaTag,
+ theManager);
- new (theResult) ThisType(
- writer,
- encoding,
- mediaType,
- doctypeSystem,
- doctypePublic,
- doIndent,
- indent,
- escapeURLs,
- omitMetaTag,
- theManager);
-
- theGuard.release();
+ theGuard.release();
return theResult;
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp Wed Nov 19 12:07:05 2008
@@ -73,7 +73,7 @@
const XalanDOMString& encoding,
bool normalizeLinefeed,
bool handleIgnorableWhitespace,
- MemoryManager& theManager ) :
+ MemoryManager& theManager) :
FormatterListener(OUTPUT_METHOD_TEXT),
m_writer(&writer),
m_maxCharacter(0),
@@ -96,9 +96,11 @@
update(false);
}
+
+
FormatterToText*
FormatterToText::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
Writer& writer,
const XalanDOMString& encoding,
bool normalizeLinefeed,
@@ -106,16 +108,15 @@
{
typedef FormatterToText ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(
- writer,
- encoding,
- normalizeLinefeed,
- handleIgnorableWhitespace,
- theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ writer,
+ encoding,
+ normalizeLinefeed,
+ handleIgnorableWhitespace,
+ theManager);
theGuard.release();
@@ -123,6 +124,7 @@
}
+
FormatterToText::~FormatterToText()
{
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Wed Nov 19 12:07:05 2008
@@ -323,48 +323,51 @@
initCharsMap();
}
+
+
FormatterToXML*
FormatterToXML::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
Writer& writer,
const XalanDOMString& version,
- bool doIndent ,
- int indent ,
- const XalanDOMString& encoding ,
- const XalanDOMString& mediaType ,
- const XalanDOMString& doctypeSystem ,
- const XalanDOMString& doctypePublic ,
- bool xmlDecl ,
- const XalanDOMString& standalone ,
+ bool doIndent,
+ int indent,
+ const XalanDOMString& encoding,
+ const XalanDOMString& mediaType,
+ const XalanDOMString& doctypeSystem,
+ const XalanDOMString& doctypePublic,
+ bool xmlDecl,
+ const XalanDOMString& standalone,
eFormat format,
- bool fBufferData )
+ bool fBufferData)
{
- typedef FormatterToXML ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef FormatterToXML ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType( writer,
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ writer,
version,
- doIndent ,
- indent ,
- encoding ,
- mediaType ,
- doctypeSystem ,
- doctypePublic ,
- xmlDecl ,
- standalone ,
+ doIndent,
+ indent,
+ encoding,
+ mediaType,
+ doctypeSystem,
+ doctypePublic,
+ xmlDecl,
+ standalone,
format,
fBufferData,
theManager);
-
theGuard.release();
return theResult;
}
+
+
FormatterToXML::~FormatterToXML()
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp Wed Nov 19 12:07:05 2008
@@ -58,7 +58,7 @@
NameSpace(
const XalanDOMString& prefix,
const XalanDOMString& uri,
- MemoryManager& theManager) :
+ MemoryManager& theManager) :
m_prefix(prefix, theManager),
m_uri(uri, theManager)
{
@@ -68,22 +68,26 @@
create(
const XalanDOMString& prefix,
const XalanDOMString& uri,
- MemoryManager& theManager)
+ MemoryManager& theManager)
{
- typedef NameSpace ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(prefix, uri, theManager);
-
+ typedef NameSpace ThisType;
+
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
+
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ prefix,
+ uri,
+ theManager);
+
theGuard.release();
-
+
return theResult;
}
- NameSpace( const NameSpace& other,
- MemoryManager& theManager) :
+
+ NameSpace(
+ const NameSpace& other,
+ MemoryManager& theManager) :
m_prefix(other.m_prefix, theManager),
m_uri(other.m_uri, theManager)
{
Modified: xalan/c/trunk/src/xalanc/XPath/XPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.cpp Wed Nov 19 12:07:05 2008
@@ -79,19 +79,22 @@
MemoryManager& theManager,
const Locator* theLocator)
{
- typedef XPath Type;
+ typedef XPath ThisType;
- XalanMemMgrAutoPtr<Type, false> theGuard( theManager , (Type*)theManager.allocate(sizeof(Type)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- Type* theResult = theGuard.get();
-
- new (theResult) Type(theManager, theLocator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ theLocator);
theGuard.release();
return theResult;
}
+
+
XPath::~XPath()
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp Wed Nov 19 12:07:05 2008
@@ -69,7 +69,7 @@
XPathEvaluator::XPathEvaluator(MemoryManager& theManager) :
m_xobjectFactory(theManager, XObjectFactoryDefault::create(theManager)),
- m_xpathFactory(theManager, XPathFactoryDefault::createXPathFactoryDefault(theManager)),
+ m_xpathFactory(theManager, XPathFactoryDefault::create(theManager)),
m_constructionContext(theManager, XPathConstructionContextDefault::create(theManager)),
m_executionContext(theManager, XPathExecutionContextDefault::create(theManager)),
m_memoryManager(theManager)
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp Wed Nov 19 12:07:05 2008
@@ -109,20 +109,21 @@
XPathExecutionContextDefault*
XPathExecutionContextDefault::create(
MemoryManager& theManager,
- XalanNode* theCurrentNode,
- const NodeRefListBase* theContextNodeList,
- const PrefixResolver* thePrefixResolver)
+ XalanNode* theCurrentNode,
+ const NodeRefListBase* theContextNodeList,
+ const PrefixResolver* thePrefixResolver)
{
- typedef XPathExecutionContextDefault ThisType;
+ typedef XPathExecutionContextDefault ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType( theManager,
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
theCurrentNode,
theContextNodeList,
thePrefixResolver);
+
theGuard.release();
return theResult;
Modified: xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp Wed Nov 19 12:07:05 2008
@@ -26,35 +26,37 @@
#include "XPath.hpp"
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
XALAN_CPP_NAMESPACE_BEGIN
-XPathFactoryDefault::XPathFactoryDefault(MemoryManager& theManager) :
+XPathFactoryDefault::XPathFactoryDefault(MemoryManager& theManager) :
XPathFactory(),
m_xpaths(theManager)
{
}
+
+
XPathFactoryDefault*
-XPathFactoryDefault::createXPathFactoryDefault(MemoryManager& theManager)
+XPathFactoryDefault::create(MemoryManager& theManager)
{
- typedef XPathFactoryDefault ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XPathFactoryDefault ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theManager);
theGuard.release();
return theResult;
}
+
+
XPathFactoryDefault::~XPathFactoryDefault()
{
reset();
@@ -90,7 +92,9 @@
}
else
{
- destroyObjWithMemMgr(theXPath, m_xpaths.getMemoryManager());
+ XalanDestroy(
+ m_xpaths.getMemoryManager(),
+ const_cast<XPath*>(theXPath));
return true;
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp Wed Nov 19 12:07:05 2008
@@ -50,7 +50,7 @@
~XPathFactoryDefault();
static XPathFactoryDefault*
- createXPathFactoryDefault(MemoryManager& theManager);
+ create(MemoryManager& theManager);
// Inherited from XPathFactory...
virtual void
Modified: xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp Wed Nov 19 12:07:05 2008
@@ -65,13 +65,12 @@
virtual Function*
clone(MemoryManager& theManager) const
{
- typedef FunctionNotImplemented Type;
+ typedef FunctionNotImplemented ThisType;
- XalanMemMgrAutoPtr<Type, false> theGuard( theManager , (Type*)theManager.allocate(sizeof(Type)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- Type* theResult = theGuard.get();
-
- new (theResult) Type(m_name);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(m_name);
theGuard.release();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp Wed Nov 19 12:07:05 2008
@@ -96,18 +96,18 @@
XalanFileLoc lineNumber,
XalanFileLoc columnNumber)
{
- typedef ElemForwardCompatible ThisType;
+ typedef ElemForwardCompatible ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(constructionContext,
- stylesheetTree,
- name,
- atts,
- lineNumber,
- columnNumber);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ constructionContext,
+ stylesheetTree,
+ name,
+ atts,
+ lineNumber,
+ columnNumber);
theGuard.release();
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp Wed Nov 19 12:07:05 2008
@@ -179,7 +179,7 @@
ElemNumber*
ElemNumber::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
@@ -187,18 +187,18 @@
XalanFileLoc columnNumber,
unsigned long id)
{
- typedef ElemNumber ThisType;
+ typedef ElemNumber ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(constructionContext,
- stylesheetTree,
- atts,
- lineNumber,
- columnNumber,
- id);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ constructionContext,
+ stylesheetTree,
+ atts,
+ lineNumber,
+ columnNumber,
+ id);
theGuard.release();
@@ -845,7 +845,7 @@
{
// Helper to format local specific numbers to strings.
- XalanMemMgrAutoPtr<XalanNumberFormat, true> formatter(executionContext.createXalanNumberFormat());
+ XalanMemMgrAutoPtr<XalanNumberFormat> formatter(executionContext.createXalanNumberFormat());
typedef XPathExecutionContext::GetCachedString GetCachedString;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp Wed Nov 19 12:07:05 2008
@@ -131,17 +131,17 @@
XalanFileLoc lineNumber,
XalanFileLoc columnNumber)
{
- typedef ElemSort ThisType;
+ typedef ElemSort ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(constructionContext,
- stylesheetTree,
- atts,
- lineNumber,
- columnNumber);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ constructionContext,
+ stylesheetTree,
+ atts,
+ lineNumber,
+ columnNumber);
theGuard.release();
Modified: xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp Wed Nov 19 12:07:05 2008
@@ -75,39 +75,46 @@
*
* @param namespaceUri the extension namespace URI that I'm implementing
*/
-ExtensionNSHandler::ExtensionNSHandler(const XalanDOMString& namespaceUri,
- MemoryManager& theManager) :
+ExtensionNSHandler::ExtensionNSHandler(
+ const XalanDOMString& namespaceUri,
+ MemoryManager& theManager) :
ExtensionFunctionHandler(namespaceUri, theManager),
m_elements(theManager),
m_componentDescLoaded(false)
{
}
-ExtensionNSHandler*
-ExtensionNSHandler::create(const XalanDOMString& namespaceUri,
- MemoryManager& theManager)
-{
- typedef ExtensionNSHandler ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(namespaceUri, theManager);
+ExtensionNSHandler*
+ExtensionNSHandler::create(
+ const XalanDOMString& namespaceUri,
+ MemoryManager& theManager)
+{
+ typedef ExtensionNSHandler ThisType;
+
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
+
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ namespaceUri,
+ theManager);
theGuard.release();
return theResult;
}
+
+
ExtensionNSHandler::ExtensionNSHandler (
- MemoryManager& theManager,
- const XalanDOMString& namespaceUri,
- const XalanDOMString& elemNames,
- const XalanDOMString& funcNames,
- const XalanDOMString& lang,
- const XalanDOMString& srcURL,
- const XalanDOMString& src) :
+ MemoryManager& theManager,
+ const XalanDOMString& namespaceUri,
+ const XalanDOMString& elemNames,
+ const XalanDOMString& funcNames,
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& src) :
ExtensionFunctionHandler(theManager, namespaceUri, funcNames, lang, srcURL, src),
m_elements(theManager),
m_componentDescLoaded(true)
Modified: xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp Wed Nov 19 12:07:05 2008
@@ -198,28 +198,33 @@
}
} // end constructor
+
+
KeyTable*
-KeyTable::create(MemoryManager& theManager,
+KeyTable::create(
+ MemoryManager& theManager,
XalanNode* startNode,
const PrefixResolver& resolver,
const KeyDeclarationVectorType& keyDeclarations,
StylesheetExecutionContext& executionContext)
{
- typedef KeyTable ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef KeyTable ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType( startNode,
- resolver,
- keyDeclarations,
- executionContext);
- theGuard.release();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ startNode,
+ resolver,
+ keyDeclarations,
+ executionContext);
+ theGuard.release();
return theResult;
}
+
+
KeyTable::~KeyTable()
{
}
Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp Wed Nov 19 12:07:05 2008
@@ -30,7 +30,6 @@
#include <xalanc/Include/STLHelper.hpp>
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
@@ -154,7 +153,7 @@
Stylesheet*
Stylesheet::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
StylesheetRoot& root,
const XalanDOMString& baseIdentifier,
StylesheetConstructionContext& constructionContext)
@@ -1401,8 +1400,11 @@
StylesheetConstructionContext& theConstructionContext,
const XalanDOMString& uri)
{
- XalanMemMgrAutoPtr<ExtensionNSHandler, true> theGuard( theConstructionContext.getMemoryManager(),
- ExtensionNSHandler::create(uri, theConstructionContext.getMemoryManager()));
+ XalanMemMgrAutoPtr<ExtensionNSHandler> theGuard(
+ theConstructionContext.getMemoryManager(),
+ ExtensionNSHandler::create(
+ uri,
+ theConstructionContext.getMemoryManager()));
m_extensionNamespaces.insert(uri, theGuard.get());
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp Wed Nov 19 12:07:05 2008
@@ -444,7 +444,7 @@
XPathFactory& m_xpathFactory;
- typedef XalanMemMgrAutoPtr<XPathProcessor, true> XPathProcessAutoPtr;
+ typedef XalanMemMgrAutoPtr<XPathProcessor> XPathProcessAutoPtr;
XPathProcessAutoPtr m_xpathProcessor;
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp Wed Nov 19 12:07:05 2008
@@ -1518,7 +1518,7 @@
};
#endif
- typedef XalanMemMgrAutoPtr<XalanNumberFormat,true> XalanNumberFormatAutoPtr;
+ typedef XalanMemMgrAutoPtr<XalanNumberFormat> XalanNumberFormatAutoPtr;
/**
* Create a new XalanNumberFormat instance.
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Wed Nov 19 12:07:05 2008
@@ -162,7 +162,7 @@
StylesheetExecutionContextDefault::StylesheetExecutionContextDefault(
- MemoryManager& theManager,
+ MemoryManager& theManager,
XalanNode* theCurrentNode,
const NodeRefListBase* theContextNodeList,
const PrefixResolver* thePrefixResolver) :
@@ -225,29 +225,28 @@
StylesheetExecutionContextDefault*
StylesheetExecutionContextDefault::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
XalanNode* theCurrentNode,
const NodeRefListBase* theContextNodeList,
const PrefixResolver* thePrefixResolver)
{
- typedef StylesheetExecutionContextDefault ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef StylesheetExecutionContextDefault ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
theManager,
theCurrentNode,
theContextNodeList,
thePrefixResolver);
-
theGuard.release();
return theResult;
}
+
StylesheetExecutionContextDefault::~StylesheetExecutionContextDefault()
{
reset();
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp Wed Nov 19 12:07:05 2008
@@ -1112,7 +1112,7 @@
* The factory that will be used to create result tree fragments based on our
* internal source tree.
*/
- mutable XalanMemMgrAutoPtr<XalanSourceTreeDocument, true> m_sourceTreeResultTreeFactory;
+ mutable XalanMemMgrAutoPtr<XalanSourceTreeDocument> m_sourceTreeResultTreeFactory;
// Holds the current mode.
const XalanQName* m_mode;
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp Wed Nov 19 12:07:05 2008
@@ -29,7 +29,6 @@
#include <xalanc/Include/STLHelper.hpp>
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
@@ -1351,7 +1350,8 @@
// This will take care of cleaning up the stylesheet if an exception
// is thrown.
- typedef XalanMemMgrAutoPtr<Stylesheet, true> AutpPtr;
+ typedef XalanMemMgrAutoPtr<Stylesheet> AutpPtr;
+
AutpPtr importedStylesheet(
m_constructionContext.getMemoryManager(),
m_constructionContext.create(
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp Wed Nov 19 12:07:05 2008
@@ -115,25 +115,29 @@
}
+
StylesheetRoot*
StylesheetRoot::create(
- MemoryManager& theManager,
- const XalanDOMString& baseIdentifier,
- StylesheetConstructionContext& constructionContext)
-{
- typedef StylesheetRoot ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ MemoryManager& theManager,
+ const XalanDOMString& baseIdentifier,
+ StylesheetConstructionContext& constructionContext)
+{
+ typedef StylesheetRoot ThisType;
+
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
+
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ baseIdentifier,
+ constructionContext);
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(baseIdentifier, constructionContext);
-
theGuard.release();
return theResult;
}
+
+
StylesheetRoot::~StylesheetRoot()
{
}
Modified: xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp Wed Nov 19 12:07:05 2008
@@ -25,56 +25,67 @@
TopLevelArg::TopLevelArg(
- MemoryManager& theManager,
- const XalanQName& name,
- const XalanDOMString& expr) :
+ MemoryManager& theManager,
+ const XalanQName& name,
+ const XalanDOMString& expr) :
m_qname(name, theManager),
m_expression(expr, theManager),
m_xobject(0)
{
}
+
+
+
TopLevelArg*
TopLevelArg::create(
- MemoryManager& theManager,
- const XalanQName& name,
- const XalanDOMString& expr)
+ MemoryManager& theManager,
+ const XalanQName& name,
+ const XalanDOMString& expr)
{
typedef TopLevelArg ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theManager, name, expr);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ name,
+ expr);
theGuard.release();
return theResult;
}
+
+
TopLevelArg::TopLevelArg(
- MemoryManager& theManager,
- const XalanQName& name,
- const XObjectPtr variable) :
+ MemoryManager& theManager,
+ const XalanQName& name,
+ const XObjectPtr variable) :
m_qname(name, theManager),
m_expression(theManager),
m_xobject(variable)
{
}
+
+
TopLevelArg*
TopLevelArg::create(
- MemoryManager& theManager,
- const XalanQName& name,
- const XObjectPtr variable)
+ MemoryManager& theManager,
+ const XalanQName& name,
+ const XObjectPtr variable)
{
typedef TopLevelArg ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theManager, name, variable);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ name,
+ variable);
theGuard.release();
@@ -82,8 +93,10 @@
}
-TopLevelArg::TopLevelArg(const TopLevelArg& theSource,
- MemoryManager& theManager) :
+
+TopLevelArg::TopLevelArg(
+ const TopLevelArg& theSource,
+ MemoryManager& theManager) :
m_qname(theSource.m_qname, theManager),
m_expression(theSource.m_expression, theManager),
m_xobject(theSource.m_xobject)
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Wed Nov 19 12:07:05 2008
@@ -838,7 +838,7 @@
}
}
- if(nl.getLength() == 0)
+ if (nl.getLength() == 0)
{
const CCGetCachedString theGuard(constructionContext);
@@ -853,11 +853,11 @@
XalanNode* const frag = nl.item(0);
- if(XalanNode::ELEMENT_NODE == frag->getNodeType())
+ if (XalanNode::ELEMENT_NODE == frag->getNodeType())
{
- XalanMemMgrAutoPtr<Stylesheet, true> theGuard;
+ XalanMemMgrAutoPtr<Stylesheet> theGuard;
- if(isRoot)
+ if (isRoot)
{
StylesheetRoot* const theLocalRoot =
constructionContext.create(stringHolder);
@@ -902,7 +902,7 @@
}
else
{
- XalanMemMgrAutoPtr<Stylesheet, true> theGuard;
+ XalanMemMgrAutoPtr<Stylesheet> theGuard;
const XalanDocument* const theOwnerDocument =
fragBase.getNodeType() == XalanNode::DOCUMENT_NODE ?
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp Wed Nov 19 12:07:05 2008
@@ -177,13 +177,13 @@
const XalanDOMString& m_string;
};
- typedef XalanMemMgrAutoPtr<XPathProcessor, true> XPathProcessorPtrType;
- typedef Function::XObjectArgVectorType XObjectArgVectorType;
- typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
- typedef XPathConstructionContext::GetCachedString CCGetCachedString;
- typedef XPathExecutionContext::GetCachedString ECGetCachedString;
+ typedef XalanMemMgrAutoPtr<XPathProcessor> XPathProcessorPtrType;
+ typedef Function::XObjectArgVectorType XObjectArgVectorType;
+ typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
+ typedef XPathConstructionContext::GetCachedString CCGetCachedString;
+ typedef XPathExecutionContext::GetCachedString ECGetCachedString;
- typedef XalanMap<XalanDOMString, XalanParamHolder> ParamMapType;
+ typedef XalanMap<XalanDOMString, XalanParamHolder> ParamMapType;
// Public members
//---------------------------------------------------------------------
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp Wed Nov 19 12:07:05 2008
@@ -50,23 +50,25 @@
}
}
+
+
XSLTInit*
XSLTInit::create(MemoryManager& theManager)
{
- typedef XSLTInit ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XSLTInit ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theManager);
- theGuard.release();
+ theGuard.release();
- return theResult;
+ return theResult;
}
+
XSLTInit::~XSLTInit()
{
--s_initCounter;
@@ -77,14 +79,18 @@
}
}
+
+
MemoryManager&
XSLTInit::getMemoryManager()
{
- assert( s_staticMemoryManager !=0);
+ assert(s_staticMemoryManager != 0);
return *s_staticMemoryManager;
}
+
+
void
XSLTInit::initialize(MemoryManager& theManager)
{
@@ -96,7 +102,7 @@
StylesheetHandler::initialize(theManager);
- s_staticMemoryManager = & theManager;
+ s_staticMemoryManager = &theManager;
}
@@ -114,7 +120,6 @@
Constants::terminate();
s_staticMemoryManager = 0;
-
}
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp Wed Nov 19 12:07:05 2008
@@ -54,7 +54,6 @@
{
public:
- explicit
XSLTInit(MemoryManager& theManager);
~XSLTInit();
@@ -62,10 +61,9 @@
static XSLTInit*
create(MemoryManager& theManager);
- inline MemoryManager&
+ MemoryManager&
getMemoryManager();
-
private:
// Not implemented...
Modified: xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.cpp Wed Nov 19 12:07:05 2008
@@ -101,7 +101,7 @@
XalanDOMString*
XalanDOMString::clone(MemoryManager& theManager)
{
- typedef XalanDOMString ThisType;
+ typedef XalanDOMString ThisType;
XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp Wed Nov 19 12:07:05 2008
@@ -153,15 +153,14 @@
#endif
clone(MemoryManager& theManager) const
{
- typedef XalanEXSLTFunctionObjectType Type;
+ typedef XalanEXSLTFunctionObjectType ThisType;
- XalanMemMgrAutoPtr<Type, false> theGuard( theManager , (Type*)theManager.allocate(sizeof(Type)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- Type* theResult = theGuard.get();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theManager);
- new (theResult) Type(theManager);
-
- theGuard.release();
+ theGuard.release();
return theResult;
}
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp Wed Nov 19 12:07:05 2008
@@ -21,7 +21,6 @@
#include <xalanc/Include/XalanSet.hpp>
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
#include <xalanc/XalanDOM/XalanDOMString.hpp>
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp Wed Nov 19 12:07:05 2008
@@ -54,7 +54,7 @@
XalanSourceTreeDocument::XalanSourceTreeDocument(
- MemoryManager& theManager,
+ MemoryManager& theManager,
bool fPoolAllText,
block_size_type theNamesStringPoolBlockSize,
bucket_count_type theNamesStringPoolBucketCount,
@@ -87,36 +87,41 @@
{
}
+
+
XalanSourceTreeDocument*
XalanSourceTreeDocument::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
bool fPoolAllText,
- block_size_type theNamesStringPoolBlockSize ,
+ block_size_type theNamesStringPoolBlockSize,
bucket_count_type theNamesStringPoolBucketCount,
bucket_size_type theNamesStringPoolBucketSize,
block_size_type theValuesStringPoolBlockSize,
bucket_count_type theValuesStringPoolBucketCount,
bucket_size_type theValuesStringPoolBucketSize)
{
- typedef XalanSourceTreeDocument ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theManager,
- fPoolAllText,
- theNamesStringPoolBlockSize,
- theNamesStringPoolBucketCount,
- theNamesStringPoolBucketSize,
- theValuesStringPoolBlockSize,
- theValuesStringPoolBucketCount,
- theValuesStringPoolBucketSize);
- theGuard.release();
+ typedef XalanSourceTreeDocument ThisType;
- return theResult;
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
+
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ fPoolAllText,
+ theNamesStringPoolBlockSize,
+ theNamesStringPoolBucketCount,
+ theNamesStringPoolBucketSize,
+ theValuesStringPoolBlockSize,
+ theValuesStringPoolBucketCount,
+ theValuesStringPoolBucketSize);
+
+ theGuard.release();
+
+ return theResult;
}
+
+
XalanSourceTreeDocument::XalanSourceTreeDocument(
MemoryManager& theManager,
allocator_size_type theAttributeBlockSize,
Modified: xalan/c/trunk/src/xalanc/XalanTransformer/XalanCAPI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanTransformer/XalanCAPI.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanTransformer/XalanCAPI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanTransformer/XalanCAPI.cpp Wed Nov 19 12:07:05 2008
@@ -35,11 +35,14 @@
#include "XalanCAPI.h"
#include "XalanTransformer.hpp"
-#include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
+
+
+#include "xalanc/Include/XalanMemoryManagement.hpp"
XALAN_USING_STD(istrstream)
+XALAN_USING_XALAN(XalanAllocationGuard)
XALAN_USING_XALAN(XalanCompiledStylesheet)
XALAN_USING_XALAN(XalanDOMString)
XALAN_USING_XALAN(XalanParsedSource)
@@ -106,16 +109,14 @@
// Create a XalanTransformer object.
typedef XalanTransformer ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theManager);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theManager);
- theGuard.release();
-
- return (XalanHandle)theResult;
+ theGuard.release();
+ return theResult;
}
Modified: xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultDocumentBuilder.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultDocumentBuilder.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultDocumentBuilder.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultDocumentBuilder.cpp Wed Nov 19 12:07:05 2008
@@ -42,22 +42,29 @@
m_domSupport.setParserLiaison(&m_parserLiaison);
}
+
+
XalanDefaultDocumentBuilder*
-XalanDefaultDocumentBuilder::create(MemoryManager& theManager, const XalanDOMString& theURI)
+XalanDefaultDocumentBuilder::create(
+ MemoryManager& theManager,
+ const XalanDOMString& theURI)
{
- typedef XalanDefaultDocumentBuilder ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XalanDefaultDocumentBuilder ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theManager, theURI);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ theURI);
- theGuard.release();
+ theGuard.release();
- return theResult;
+ return theResult;
}
+
+
XalanDefaultDocumentBuilder::~XalanDefaultDocumentBuilder()
{
}
Modified: xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp Wed Nov 19 12:07:05 2008
@@ -104,30 +104,37 @@
-XalanDefaultParsedSourceHelper::XalanDefaultParsedSourceHelper(const XalanSourceTreeDOMSupport& theSourceDOMSupport,
- MemoryManager& theManager) :
+XalanDefaultParsedSourceHelper::XalanDefaultParsedSourceHelper(
+ const XalanSourceTreeDOMSupport& theSourceDOMSupport,
+ MemoryManager& theManager) :
m_parserLiaison(theManager),
m_domSupport(m_parserLiaison, theSourceDOMSupport)
{
}
+
+
XalanDefaultParsedSourceHelper*
-XalanDefaultParsedSourceHelper::create(const XalanSourceTreeDOMSupport& theSourceDOMSupport,
- MemoryManager& theManager)
+XalanDefaultParsedSourceHelper::create(
+ const XalanSourceTreeDOMSupport& theSourceDOMSupport,
+ MemoryManager& theManager)
{
- typedef XalanDefaultParsedSourceHelper ThisType;
+ typedef XalanDefaultParsedSourceHelper ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theSourceDOMSupport,
+ theManager);
- new (theResult) ThisType(theSourceDOMSupport, theManager);
-
theGuard.release();
return theResult;
}
+
+
XalanDefaultParsedSourceHelper::~XalanDefaultParsedSourceHelper()
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Modified: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj Wed Nov 19 12:07:05 2008
@@ -1,3561 +1,3553 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="AllInOneWithICU"
- ProjectGUID="{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}"
- RootNamespace="AllInOneWithICU"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\..\Build\Win32\VC9\Debug"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT)\include"
- PreprocessorDefinitions="XALAN_BUILD_DLL;XALAN_USE_ICU;XALAN_ICU_MSG_LOADER"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3D.lib XalanMessages_1_11.lib icuucd.lib icuind.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11D.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC9\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC9\Debug;$(OutDir);$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1D.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="..\..\..\..\Build\Win64\VC9\Debug"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT)\include"
- PreprocessorDefinitions="XALAN_BUILD_DLL;XALAN_USE_ICU;XALAN_ICU_MSG_LOADER"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3D.lib XalanMessages_1_11.lib icuucd.lib icuind.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11D.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC9\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC9\Debug;$(OutDir);$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1D.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\..\Build\Win32\VC9\Release"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT)\include"
- PreprocessorDefinitions="NDEBUG;XALAN_BUILD_DLL;XALAN_USE_ICU;XALAN_ICU_MSG_LOADER;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC9\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC9\Release;$(OutDir);$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="..\..\..\..\Build\Win64\VC9\Release"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT)\include"
- PreprocessorDefinitions="NDEBUG;XALAN_BUILD_DLL;XALAN_USE_ICU;XALAN_ICU_MSG_LOADER;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC9\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC9\Release;$(OutDir);$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Include"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\PlatformDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\STLHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\VCPPDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanAutoPtr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanDeque.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectStackCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanVector.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanVersion.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XalanDOM"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanAttr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanAttr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCDataSection.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCDATASection.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCharacterData.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCharacterData.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanComment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanComment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocument.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentFragment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentFragment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentType.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentType.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMImplementation.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMImplementation.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMString.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEmptyNamedNodeMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEmptyNamedNodeMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntity.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntity.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntityReference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntityReference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNamedNodeMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNamedNodeMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNode.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeListDummy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeListDummy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNotation.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNotation.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanProcessingInstruction.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanProcessingInstruction.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanText.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath="..\..\Res\AllInOne\AllInOne.rc"
- >
- </File>
- <File
- RelativePath="..\..\Res\AllInOne\resource.h"
- >
- </File>
- </Filter>
- <Filter
- Name="PlatformSupport"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ArenaAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ArenaBlock.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ArenaBlockBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeListImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeListImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributesImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributesImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeVectorEntry.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeVectorEntryExtended.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DirectoryEnumerator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringHelper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringPrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringPrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DoubleSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DoubleSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ExecutionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ExecutionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\FormatterListener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\FormatterListener.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NamedNodeMapAttributeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NamedNodeMapAttributeList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NullPrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NullPrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PlatformSupportDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PlatformSupportInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PlatformSupportInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrefixResolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrefixResolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaBlock.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StdBinInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StdBinInputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StringTokenizer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StringTokenizer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\URISupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\URISupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Writer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Writer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanArrayAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanBitmap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanBitmap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanCollationServices.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDecimalFormatSymbols.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDecimalFormatSymbols.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringCache.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringHashTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringHashTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringPool.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringPool.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringReusableAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringReusableAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanEncodingPropertyCache.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanEncodingPropertyCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFileOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFileOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFStreamOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFStreamOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanICUMessageLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanICUMessageLoader.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanLocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMemoryManagement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMemoryManagerDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMemoryManagerDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMessageLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMessageLoader.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNamespace.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNullOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNullOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNumberFormat.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNumberFormat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStreamPrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStreamPrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanParsedURI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanParsedURI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanReferenceCountedObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanReferenceCountedObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanSimplePrefixResolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanSimplePrefixResolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanStdOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanStdOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanToXercesTranscoderWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanToXercesTranscoderWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanTranscodingServices.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanTranscodingServices.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanUnicode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanUTF16Transcoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanUTF16Transcoder.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanXMLChar.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanXMLChar.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XSLException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XSLException.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="DOMSupport"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMServices.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMServices.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\TreeWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\TreeWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanDocumentPrefixResolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanDocumentPrefixResolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanNamespacesStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanNamespacesStack.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XPath"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\ElementPrefixResolverProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\ElementPrefixResolverProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FormatterStringLengthCounter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FormatterStringLengthCounter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\Function.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\Function.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionConcat.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionConcat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionContains.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionContains.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionID.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionID.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionLang.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionLang.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNamespaceURI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNamespaceURI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNormalizeSpace.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNormalizeSpace.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionStartsWith.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionStartsWith.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionString.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstring.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringAfter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringAfter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringBefore.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringBefore.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionTranslate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionTranslate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\MutableNodeRefList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\MutableNodeRefList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NameSpace.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefListBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefListBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanDocumentFragmentNodeRefListBaseProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanDocumentFragmentNodeRefListBaseProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQName.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQName.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByReference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByReference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValue.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValue.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValueAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValueAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanXPathException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanXPathException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XBoolean.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XBoolean.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxyAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxyAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetResultTreeFragProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetResultTreeFragProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumber.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumber.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactoryDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactoryDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectTypeCallback.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectTypeCallback.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPath.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPath.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupportDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupportDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEvaluator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEvaluator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExpression.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExpression.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryBlock.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryBlock.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFunctionTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFunctionTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathParserException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathParserException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessor.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XString.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapterAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapterAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCached.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCached.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCachedAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCachedAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReferenceAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReferenceAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XToken.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XToken.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapterAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapterAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapterAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapterAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XUnknown.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XUnknown.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XPathCAPI"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XPathCAPI\XPathCAPI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPathCAPI\XPathCAPI.h"
- >
- </File>
- </Filter>
- <Filter
- Name="XMLSupport"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToHTML.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToHTML.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToNull.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToNull.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToXML.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToXML.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToXMLUnicode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterTreeWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterTreeWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanDummyIndentWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanFormatterWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanHTMLElementsProperties.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanHTMLElementsProperties.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanIndentWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanOtherEncodingWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF16Writer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF16Writer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF8Writer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF8Writer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerFactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLParserLiaison.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLParserLiaison.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportInit.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XercesParserLiaison"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\FormatterToXercesDOM.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\FormatterToXercesDOM.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapperAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapperAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCDATASectionWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCDATASectionWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCommentWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCommentWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentTypeWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentTypeWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMFormatterWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMFormatterWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMImplementationWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMImplementationWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWrapperException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWrapperException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapperAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapperAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityReferenceWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityReferenceWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesLiaisonXalanDOMStringPool.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesLiaisonXalanDOMStringPool.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapAttributeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapAttributeList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNodeListWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNodeListWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNotationWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNotationWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesParserLiaison.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesParserLiaison.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesParserLiaisonDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesProcessingInstructionWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesProcessingInstructionWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapperAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapperAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperHelper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigatorAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigatorAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperToXalanNodeMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperToXalanNodeMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperTypes.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XalanSourceTree"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\FormatterToSourceTree.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\FormatterToSourceTree.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeNSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeNSAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttrNS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttrNS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeComment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeComment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeCommentAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeCommentAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeContentHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeContentHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocument.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocumentFragment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocumentFragment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDOMSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDOMSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementA.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementA.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementAAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementAAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANSAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNA.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNA.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNAAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNAAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANSAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeHelper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeParserLiaison.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeParserLiaison.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstruction.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstruction.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstructionAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstructionAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWSAllocator.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XSLT"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVT.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVT.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPart.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPart.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartSimple.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartSimple.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartXPath.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartXPath.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Constants.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Constants.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\CountersTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\CountersTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\DecimalToRoman.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyImport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyImport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyTemplates.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyTemplates.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttribute.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttribute.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttributeSet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttributeSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCallTemplate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCallTemplate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemChoose.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemChoose.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemComment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemComment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopyOf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopyOf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemDecimalFormat.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemDecimalFormat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemEmpty.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemEmpty.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemExtensionCall.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemExtensionCall.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemFallback.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemFallback.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForEach.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForEach.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForwardCompatible.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForwardCompatible.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemIf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemIf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemLiteralResult.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemLiteralResult.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemMessage.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemMessage.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemNumber.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemNumber.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemOtherwise.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemOtherwise.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemParam.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemParam.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemPI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemPI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemSort.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemSort.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplateElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplateElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTextLiteral.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTextLiteral.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemUse.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemUse.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemValueOf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemValueOf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemVariable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemVariable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWhen.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWhen.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWithParam.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWithParam.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionFunctionHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionFunctionHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionNSHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionNSHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionCurrent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionCurrent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionDocument.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionElementAvailable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionElementAvailable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFormatNumber.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFormatNumber.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFunctionAvailable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFunctionAvailable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionGenerateID.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionGenerateID.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionKey.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionKey.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionSystemProperty.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionSystemProperty.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionUnparsedEntityURI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionUnparsedEntityURI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\GenerateEvent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\GenerateEvent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\KeyDeclaration.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\KeyTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\KeyTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NamespacesHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NamespacesHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSorter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSorter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSortKey.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSortKey.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\OutputContextStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\OutputContextStack.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListener.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListenerDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListenerDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ResultNamespacesStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ResultNamespacesStack.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\SelectionEvent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\SelectionEvent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Stylesheet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Stylesheet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetRoot.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetRoot.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TopLevelArg.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TopLevelArg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListener.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListenerDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListenerDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TracerEvent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TracerEvent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\VariablesStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\VariablesStack.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanAVTAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanAVTAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanAVTPartSimpleAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanAVTPartSimpleAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanAVTPartXPathAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanAVTPartXPathAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemApplyTemplatesAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemApplyTemplatesAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemAttributeAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemAttributeAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemAttributeSetAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemAttributeSetAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemCallTemplateAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemCallTemplateAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemElementAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemElementAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemEmptyAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemEmptyAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemLiteralResultAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemLiteralResultAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemTemplateAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemTemplateAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemTextAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemTextAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemTextLiteralAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemTextLiteralAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemValueOfAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemValueOfAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemVariableAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanElemVariableAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanMatchPatternData.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanMatchPatternData.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanMatchPatternDataAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanMatchPatternDataAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanNumberingResourceBundle.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanNumberingResourceBundle.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanParamHolder.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanSourceTreeDocumentAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanSourceTreeDocumentAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanSourceTreeDocumentFragmentAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanSourceTreeDocumentFragmentAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanSpaceNodeTester.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XalanSpaceNodeTester.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XResultTreeFrag.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XResultTreeFrag.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XResultTreeFragAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XResultTreeFragAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTEngineImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTEngineImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTInputSource.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTInputSource.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessor.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessorEnvSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessorEnvSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessorEnvSupportDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessorEnvSupportDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessorException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTProcessorException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTResultTarget.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\XSLTResultTarget.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XalanExtensions"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionDifference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionDifference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionDistinct.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionDistinct.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionEvaluate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionEvaluate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionHasSameNodes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionHasSameNodes.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionIntersection.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionIntersection.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionNodeSet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\FunctionNodeSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\XalanExtensions.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\XalanExtensions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanExtensions\XalanExtensionsDefinitions.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XalanEXSLT"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanEXSLT\XalanEXSLTCommon.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanEXSLT\XalanEXSLTCommon.hpp"
- >
- </File>
- <File
[... 3826 lines stripped ...]
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Propchange: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Modified: xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp Wed Nov 19 12:07:05 2008
@@ -31,8 +31,6 @@
#include <xercesc/sax/SAXParseException.hpp>
-#include <xalanc/Include/XalanMemMgrHelper.hpp>
-
#include <xalanc/XalanDOM/XalanDOMException.hpp>
@@ -134,11 +132,11 @@
#if defined(XALAN_USE_ICU)
// Create a collation function for the ICU, and have it
// cache collators...
- XalanMemMgrAutoPtr<ICUBridgeCollationCompareFunctor, true> theICUFunctor(m_memoryManager,
ICUBridgeCollationCompareFunctor::create(m_memoryManager, true));
+ XalanMemMgrAutoPtr<ICUBridgeCollationCompareFunctor> theICUFunctor(m_memoryManager,
ICUBridgeCollationCompareFunctor::create(m_memoryManager, true));
m_stylesheetExecutionContext->installCollationCompareFunctor(theICUFunctor.get());
- XalanMemMgrAutoPtr<ICUFormatNumberFunctor, true> theFormatNumberFunctor(m_memoryManager,
ICUFormatNumberFunctor::create(m_memoryManager));
+ XalanMemMgrAutoPtr<ICUFormatNumberFunctor> theFormatNumberFunctor(m_memoryManager,
ICUFormatNumberFunctor::create(m_memoryManager));
m_stylesheetExecutionContext->installFormatNumberFunctor(theFormatNumberFunctor.get());
theICUFunctor.release();
theFormatNumberFunctor.release();
@@ -172,14 +170,19 @@
#if defined(XALAN_USE_ICU)
// Uninstall the ICU collation compare functor, and destroy it...
+ XalanDestroy(
+ m_memoryManager,
+ m_stylesheetExecutionContext->uninstallCollationCompareFunctor());
- destroyObjWithMemMgr( m_stylesheetExecutionContext->uninstallCollationCompareFunctor(),
m_memoryManager);
- destroyObjWithMemMgr( m_stylesheetExecutionContext->uninstallFormatNumberFunctor(),
m_memoryManager);
+ // Uninstall the ICU format number functor, and destroy it...
+ XalanDestroy(
+ m_memoryManager,
+ m_stylesheetExecutionContext->uninstallFormatNumberFunctor());
#endif
- destroyObjWithMemMgr(
- m_stylesheetExecutionContext,
- m_memoryManager);
+ XalanDestroy(
+ m_memoryManager,
+ m_stylesheetExecutionContext);
}
@@ -188,7 +191,7 @@
XalanTransformer::initialize(MemoryManager& theManager)
{
// Initialize Xalan.
- XalanMemMgrAutoPtr<XSLTInit, true> initGuard(theManager, XSLTInit::create(theManager));
+ XalanMemMgrAutoPtr<XSLTInit> initGuard(theManager, XSLTInit::create(theManager));
XalanAutoPtr<XSLTInputSource> inputSourceGuard(new (&theManager) XSLTInputSource(theManager));
EnsureFunctionsInstallation instalGuard(theManager);
@@ -206,7 +209,7 @@
void
XalanTransformer::terminate()
{
- assert( s_initMemoryManager!= 0 );
+ assert(s_initMemoryManager != 0);
{
const EnsureFunctionsInstallation uninstallGuard(*s_initMemoryManager);
@@ -214,7 +217,9 @@
delete s_emptyInputSource;
- destroyObjWithMemMgr(s_xsltInit, *s_initMemoryManager);
+ XalanDestroy(
+ *s_initMemoryManager,
+ const_cast<XSLTInit*>(s_xsltInit));
s_emptyInputSource = 0;
s_xsltInit = 0;
@@ -719,9 +724,9 @@
{
m_compiledStylesheets.erase(i);
- destroyObjWithMemMgr(
- theStylesheet,
- m_memoryManager);
+ XalanDestroy(
+ m_memoryManager,
+ const_cast<XalanCompiledStylesheet*>(theStylesheet));
return 0;
}
@@ -848,9 +853,9 @@
assert(theParsedSource != 0);
- destroyObjWithMemMgr(
- theParsedSource,
- m_memoryManager);
+ XalanDestroy(
+ m_memoryManager,
+ const_cast<XalanParsedSource*>(theParsedSource));
return 0;
}
@@ -1181,7 +1186,7 @@
assert(theSourceDocument != 0);
// Create the helper object that is necessary for running the processor...
- XalanMemMgrAutoPtr<XalanParsedSourceHelper, true> theHelper(m_memoryManager,
theParsedXML.createHelper(m_memoryManager));
+ XalanMemMgrAutoPtr<XalanParsedSourceHelper> theHelper(m_memoryManager, theParsedXML.createHelper(m_memoryManager));
assert(theHelper.get() != 0);
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCDATASectionWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCDATASectionWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCDATASectionWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCDATASectionWrapper.cpp Wed Nov 19
12:07:05 2008
@@ -52,25 +52,31 @@
assert(theXercesCDATASection != 0);
}
+
+
XercesCDATASectionWrapper*
-XercesCDATASectionWrapper::create( MemoryManager& theManager,
+XercesCDATASectionWrapper::create(
+ MemoryManager& theManager,
const DOMCDATASectionType* theXercesCDATASection,
const XercesWrapperNavigator& theNavigator)
{
- typedef XercesCDATASectionWrapper ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XercesCDATASectionWrapper ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theXercesCDATASection, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesCDATASection,
+ theNavigator);
theGuard.release();
return theResult;
}
+
+
XercesCDATASectionWrapper::~XercesCDATASectionWrapper()
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCommentWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCommentWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCommentWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCommentWrapper.cpp Wed Nov 19 12:07:05
2008
@@ -48,25 +48,31 @@
assert(theXercesComment != 0);
}
+
+
XercesCommentWrapper*
-XercesCommentWrapper::create( MemoryManager& theManager,
- const DOMCommentType* theXercesComment,
- const XercesWrapperNavigator& theNavigator)
+XercesCommentWrapper::create(
+ MemoryManager& theManager,
+ const DOMCommentType* theXercesComment,
+ const XercesWrapperNavigator& theNavigator)
{
- typedef XercesCommentWrapper ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XercesCommentWrapper ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theXercesComment, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesComment,
+ theNavigator);
theGuard.release();
return theResult;
}
+
+
XercesCommentWrapper::~XercesCommentWrapper()
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMImplementationWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMImplementationWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMImplementationWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMImplementationWrapper.cpp Wed Nov
19 12:07:05 2008
@@ -56,23 +56,27 @@
{
}
+
+
XercesDOMImplementationWrapper*
-XercesDOMImplementationWrapper::create(MemoryManager& theManager, DOMImplementationType*
theXercesDOMImplementation)
+XercesDOMImplementationWrapper::create(
+ MemoryManager& theManager,
+ DOMImplementationType* theXercesDOMImplementation)
{
- typedef XercesDOMImplementationWrapper ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XercesDOMImplementationWrapper ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theXercesDOMImplementation);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(theXercesDOMImplementation);
- theGuard.release();
+ theGuard.release();
- return theResult;
+ return theResult;
}
+
bool
XercesDOMImplementationWrapper::hasFeature(
const XalanDOMString& feature,
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp Wed Nov 19
12:07:05 2008
@@ -52,24 +52,30 @@
assert(theXercesDOMDocumentType != 0);
}
+
+
XercesDocumentTypeWrapper*
-XercesDocumentTypeWrapper::create( MemoryManager& theManager,
+XercesDocumentTypeWrapper::create(
+ MemoryManager& theManager,
const DOMDocumentType_Type* theXercesDOMDocumentType,
const XercesWrapperNavigator& theNavigator)
{
- typedef XercesDocumentTypeWrapper ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XercesDocumentTypeWrapper ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theXercesDOMDocumentType, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesDOMDocumentType,
+ theNavigator);
theGuard.release();
return theResult;
}
+
+
XercesDocumentTypeWrapper::~XercesDocumentTypeWrapper()
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp Wed Nov 19 12:07:05
2008
@@ -75,7 +75,7 @@
XercesDocumentWrapper::XercesDocumentWrapper(
- MemoryManager& theManager,
+ MemoryManager& theManager,
const DOMDocument_Type* theXercesDocument,
bool threadSafe,
bool buildWrapper,
@@ -117,31 +117,35 @@
}
}
+
+
XercesDocumentWrapper*
XercesDocumentWrapper::create(
- MemoryManager& theManager,
+ MemoryManager& theManager,
const DOMDocument_Type* theXercesDocument,
bool threadSafe,
bool buildWrapper,
bool buildMaps)
{
- typedef XercesDocumentWrapper ThisType;
+ typedef XercesDocumentWrapper ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theManager,
+ theXercesDocument,
+ threadSafe,
+ buildWrapper,
+ buildMaps);
- new (theResult) ThisType(theManager,
- theXercesDocument,
- threadSafe,
- buildWrapper,
- buildMaps);
-
theGuard.release();
return theResult;
}
+
+
XercesDocumentWrapper::~XercesDocumentWrapper()
{
destroyWrapper();
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp Wed Nov 19 12:07:05
2008
@@ -465,37 +465,37 @@
// This is a private helper class for building the tree...
friend class BuildWrapperTreeWalker;
- const DOMDocument_Type* const m_xercesDocument;
+ const DOMDocument_Type* const m_xercesDocument;
- XalanElement* m_documentElement;
+ XalanElement* m_documentElement;
- mutable XercesWrapperToXalanNodeMap m_nodeMap;
+ mutable XercesWrapperToXalanNodeMap m_nodeMap;
- mutable XercesWrapperNavigatorAllocator m_navigatorAllocator;
+ mutable XercesWrapperNavigatorAllocator m_navigatorAllocator;
// Our navigator will be the first entry in m_navigators,
// but we'll cache this so access is faster...
- XercesWrapperNavigator* m_navigator;
+ XercesWrapperNavigator* m_navigator;
- XercesNodeListWrapper m_children;
+ XercesNodeListWrapper m_children;
- mutable NodeVectorType m_nodes;
+ mutable NodeVectorType m_nodes;
- mutable XercesDocumentTypeWrapper* m_doctype;
+ mutable XercesDocumentTypeWrapper* m_doctype;
- bool m_mappingMode;
+ bool m_mappingMode;
- bool m_indexValid;
+ bool m_indexValid;
- const bool m_buildMaps;
+ const bool m_buildMaps;
- mutable XercesElementWrapperAllocator m_elementAllocator;
+ mutable XercesElementWrapperAllocator m_elementAllocator;
- mutable XercesTextWrapperAllocator m_textAllocator;
+ mutable XercesTextWrapperAllocator m_textAllocator;
- mutable XercesAttrWrapperAllocator m_attributeAllocator;
+ mutable XercesAttrWrapperAllocator m_attributeAllocator;
- const XalanMemMgrAutoPtr<XalanDOMStringPool,true> m_stringPool;
+ const XalanMemMgrAutoPtr<XalanDOMStringPool> m_stringPool;
};
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp Wed Nov
19 12:07:05 2008
@@ -50,19 +50,23 @@
assert(theXercesDOMEntityReference != 0);
}
+
+
XercesEntityReferenceWrapper*
-XercesEntityReferenceWrapper::create( MemoryManager& theManager,
+XercesEntityReferenceWrapper::create(
+ MemoryManager& theManager,
const DOMEntityReferenceType* theXercesDOMEntityReference,
const XercesWrapperNavigator& theNavigator)
{
- typedef XercesEntityReferenceWrapper ThisType;
+ typedef XercesEntityReferenceWrapper ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theXercesDOMEntityReference, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesDOMEntityReference,
+ theNavigator);
theGuard.release();
@@ -70,6 +74,7 @@
}
+
XercesEntityReferenceWrapper::~XercesEntityReferenceWrapper()
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp Wed Nov 19 12:07:05
2008
@@ -50,25 +50,31 @@
assert(theXercesDOMEntity != 0);
}
+
+
XercesEntityWrapper*
-XercesEntityWrapper::create( MemoryManager& theManager,
+XercesEntityWrapper::create(
+ MemoryManager& theManager,
const DOMEntityType* theXercesDOMEntity,
const XercesWrapperNavigator& theNavigator)
{
- typedef XercesEntityWrapper ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XercesEntityWrapper ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theXercesDOMEntity, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesDOMEntity,
+ theNavigator);
theGuard.release();
return theResult;
}
+
+
XercesEntityWrapper::~XercesEntityWrapper()
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNotationWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNotationWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNotationWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNotationWrapper.cpp Wed Nov 19 12:07:05
2008
@@ -48,19 +48,23 @@
assert(theXercesDOMNotation != 0);
}
+
+
XercesNotationWrapper*
-XercesNotationWrapper::create( MemoryManager& theManager,
+XercesNotationWrapper::create(
+ MemoryManager& theManager,
const DOMNotationType* theXercesDOMNotation,
const XercesWrapperNavigator& theNavigator)
{
- typedef XercesNotationWrapper ThisType;
+ typedef XercesNotationWrapper ThisType;
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theXercesDOMNotation, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesDOMNotation,
+ theNavigator);
theGuard.release();
@@ -68,6 +72,7 @@
}
+
XercesNotationWrapper::~XercesNotationWrapper()
{
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp Wed Nov 19 12:07:05
2008
@@ -272,8 +272,9 @@
if (i != m_documentMap.end())
{
- const XalanMemMgrAutoPtr<XalanDocument, true> theGuard(m_documentMap.getMemoryManager(),
- theDocument);
+ const XalanMemMgrAutoPtr<XalanDocument> theGuard(
+ m_documentMap.getMemoryManager(),
+ theDocument);
m_documentMap.erase(i);
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp Wed
Nov 19 12:07:05 2008
@@ -48,25 +48,31 @@
assert(theXercesDOMProcessingInstruction != 0);
}
+
+
XercesProcessingInstructionWrapper*
-XercesProcessingInstructionWrapper::create( MemoryManager& theManager,
+XercesProcessingInstructionWrapper::create(
+ MemoryManager& theManager,
const DOMProcessingInstructionType* theXercesDOMProcessingInstruction,
const XercesWrapperNavigator& theNavigator)
{
- typedef XercesProcessingInstructionWrapper ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+ typedef XercesProcessingInstructionWrapper ThisType;
- ThisType* theResult = theGuard.get();
+ XalanAllocationGuard theGuard(theManager, theManager.allocate(sizeof(ThisType)));
- new (theResult) ThisType(theXercesDOMProcessingInstruction, theNavigator);
+ ThisType* const theResult =
+ new (theGuard.get()) ThisType(
+ theXercesDOMProcessingInstruction,
+ theNavigator);
theGuard.release();
return theResult;
}
+
+
XercesProcessingInstructionWrapper::~XercesProcessingInstructionWrapper()
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Modified: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj Wed Nov 19 12:07:05 2008
@@ -1,4395 +1,4387 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="AllInOne"
- ProjectGUID="{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}"
- RootNamespace="AllInOne"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\..\Build\Win32\VC9\Debug"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
- PreprocessorDefinitions="XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3D.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11D.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC9\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC9\Debug;$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="Xalan-C_1D.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="..\..\..\..\Build\Win64\VC9\Debug"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
- PreprocessorDefinitions="XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3D.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11D.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC9\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC9\Debug;$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1D.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\..\Build\Win32\VC9\Release"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
- PreprocessorDefinitions="NDEBUG;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC9\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC9\Release;$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="..\..\..\..\Build\Win64\VC9\Release"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
- PreprocessorDefinitions="NDEBUG;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC9\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC9\Release;$(OutDir)"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release with ICU|Win32"
- OutputDirectory="..\..\..\..\Build\Win32\VC9\Release.ICU"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT)\include"
- PreprocessorDefinitions="NDEBUG;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;XALAN_USE_ICU;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3.lib icuuc.lib icuin.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC9\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC9\Release;$(OutDir);$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release with ICU|x64"
- OutputDirectory="..\..\..\..\Build\Win64\VC9\Release.ICU"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT64)\include;$(ICUROOT)\include"
- PreprocessorDefinitions="NDEBUG;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;XALAN_USE_ICU;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3.lib icuuc.lib icuin.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC9\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC9\Release;$(OutDir);$(ICUROOT64)\lib;$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug with ICU|Win32"
- OutputDirectory="..\..\..\..\Build\Win32\VC9\Debug.ICU"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT)\include"
- PreprocessorDefinitions="XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;XALAN_USE_ICU"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3D.lib icuucd.lib icuind.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11D.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC9\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC9\Debug;$(OutDir);$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1D.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug with ICU|x64"
- OutputDirectory="..\..\..\..\Build\Win64\VC9\Debug.ICU"
- IntermediateDirectory="$(OutDir)\$(ProjectName)"
- ConfigurationType="2"
- CharacterSet="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include;$(ICUROOT64)\include;$(ICUROOT)\include"
- PreprocessorDefinitions="XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;XALAN_USE_ICU"
- StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- CompileAs="0"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_3D.lib icuucd.lib icuind.lib"
- OutputFile="$(OutDir)\Xalan-C_1_11D.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC9\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC9\Debug;$(OutDir);$(ICUROOT64)\lib;$(ICUROOT)\lib"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(TargetDir)\Xalan-C_1D.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Include"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\PlatformDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\STLHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\VCPPDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanAutoPtr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanDeque.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectStackCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanVector.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanVersion.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XalanDOM"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanAttr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanAttr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCDataSection.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCDATASection.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCharacterData.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanCharacterData.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanComment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanComment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocument.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentFragment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentFragment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentType.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDocumentType.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMImplementation.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMImplementation.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanDOMString.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEmptyNamedNodeMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEmptyNamedNodeMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntity.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntity.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntityReference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanEntityReference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNamedNodeMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNamedNodeMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNode.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeListDummy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNodeListDummy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNotation.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanNotation.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanProcessingInstruction.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanProcessingInstruction.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanDOM\XalanText.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath="..\..\Res\AllInOne\AllInOne.rc"
- >
- </File>
- <File
- RelativePath="..\..\Res\AllInOne\resource.h"
- >
- </File>
- </Filter>
- <Filter
- Name="PlatformSupport"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ArenaAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ArenaBlock.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ArenaBlockBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeListImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeListImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributesImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributesImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeVectorEntry.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\AttributeVectorEntryExtended.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DirectoryEnumerator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringHelper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringPrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DOMStringPrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DoubleSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\DoubleSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ExecutionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ExecutionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\FormatterListener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\FormatterListener.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NamedNodeMapAttributeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NamedNodeMapAttributeList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NullPrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\NullPrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PlatformSupportDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PlatformSupportInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PlatformSupportInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrefixResolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrefixResolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaBlock.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StdBinInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StdBinInputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StringTokenizer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\StringTokenizer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\URISupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\URISupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Writer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Writer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanArrayAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanBitmap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanBitmap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanCollationServices.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDecimalFormatSymbols.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDecimalFormatSymbols.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringCache.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringHashTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringHashTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringPool.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringPool.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringReusableAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanDOMStringReusableAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanEncodingPropertyCache.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanEncodingPropertyCache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFileOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFileOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFStreamOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanFStreamOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanInMemoryMessageLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanInMemoryMessageLoader.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanLocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMemoryManagement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMemoryManagerDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMemoryManagerDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMessageLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanMessageLoader.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNamespace.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNullOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNullOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNumberFormat.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanNumberFormat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStreamPrintWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanOutputStreamPrintWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanParsedURI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanParsedURI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanReferenceCountedObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanReferenceCountedObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanSimplePrefixResolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanSimplePrefixResolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanStdOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanStdOutputStream.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanToXercesTranscoderWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanToXercesTranscoderWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanTranscodingServices.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanTranscodingServices.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanUnicode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanUTF16Transcoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanUTF16Transcoder.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanXMLChar.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XalanXMLChar.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XSLException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\XSLException.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="DOMSupport"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMServices.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMServices.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\DOMSupportInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\TreeWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\TreeWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanDocumentPrefixResolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanDocumentPrefixResolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanNamespacesStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\DOMSupport\XalanNamespacesStack.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XPath"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\ElementPrefixResolverProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\ElementPrefixResolverProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FormatterStringLengthCounter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FormatterStringLengthCounter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\Function.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\Function.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionConcat.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionConcat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionContains.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionContains.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionID.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionID.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionLang.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionLang.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNamespaceURI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNamespaceURI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNormalizeSpace.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionNormalizeSpace.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionStartsWith.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionStartsWith.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionString.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstring.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringAfter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringAfter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringBefore.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionSubstringBefore.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionTranslate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\FunctionTranslate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\MutableNodeRefList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\MutableNodeRefList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NameSpace.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefListBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\NodeRefListBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanDocumentFragmentNodeRefListBaseProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanDocumentFragmentNodeRefListBaseProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQName.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQName.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByReference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByReference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValue.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValue.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValueAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanQNameByValueAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanXPathException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XalanXPathException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XBoolean.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XBoolean.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxyAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetNodeProxyAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetResultTreeFragProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNodeSetResultTreeFragProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumber.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumber.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XNumberBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactoryDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectFactoryDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectResultTreeFragProxyText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectTypeCallback.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XObjectTypeCallback.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPath.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPath.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathConstructionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupportDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEnvSupportDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEvaluator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathEvaluator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExecutionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExpression.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathExpression.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryBlock.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryBlock.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFactoryDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFunctionTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathFunctionTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathParserException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathParserException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessor.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XPathProcessorImpl.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XString.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XString.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapterAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAdapterAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCached.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCached.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCachedAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringCachedAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReference.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReference.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReferenceAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XStringReferenceAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XToken.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XToken.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapterAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenNumberAdapterAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapterAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XTokenStringAdapterAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XUnknown.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPath\XUnknown.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XPathCAPI"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XPathCAPI\XPathCAPI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XPathCAPI\XPathCAPI.h"
- >
- </File>
- </Filter>
- <Filter
- Name="XMLSupport"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToHTML.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToHTML.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToNull.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToNull.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToXML.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToXML.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterToXMLUnicode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterTreeWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\FormatterTreeWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanDummyIndentWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanFormatterWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanHTMLElementsProperties.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanHTMLElementsProperties.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanIndentWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanOtherEncodingWriter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF16Writer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF16Writer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF8Writer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanUTF8Writer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerBase.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerBase.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XalanXMLSerializerFactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLParserLiaison.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLParserLiaison.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XMLSupport\XMLSupportInit.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XercesParserLiaison"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\FormatterToXercesDOM.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\FormatterToXercesDOM.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapperAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesAttrWrapperAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCDATASectionWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCDATASectionWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCommentWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesCommentWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentTypeWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentTypeWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDocumentWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMFormatterWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMFormatterWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMImplementationWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMImplementationWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWalker.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWrapperException.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesDOMWrapperException.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapperAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesElementWrapperAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityReferenceWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityReferenceWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesEntityWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesLiaisonXalanDOMStringPool.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesLiaisonXalanDOMStringPool.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapAttributeList.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapAttributeList.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNamedNodeMapWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNodeListWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNodeListWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNotationWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesNotationWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesParserLiaison.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesParserLiaison.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesParserLiaisonDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesProcessingInstructionWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesProcessingInstructionWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapperAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesTextWrapperAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperHelper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigatorAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperNavigatorAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperToXalanNodeMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperToXalanNodeMap.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XercesParserLiaison\XercesWrapperTypes.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XalanSourceTree"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\FormatterToSourceTree.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\FormatterToSourceTree.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeNSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttributeNSAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttrNS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeAttrNS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeComment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeComment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeCommentAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeCommentAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeContentHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeContentHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDefinitions.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocument.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocumentFragment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDocumentFragment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDOMSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeDOMSupport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementA.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementA.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementAAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementAAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementANSAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNA.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNA.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNAAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNAAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeElementNANSAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeHelper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeInit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeInit.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeParserLiaison.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeParserLiaison.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstruction.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstruction.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstructionAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeProcessingInstructionAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextAllocator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWS.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWSAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XalanSourceTree\XalanSourceTreeTextIWSAllocator.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="XSLT"
- >
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVT.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVT.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPart.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPart.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartSimple.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartSimple.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartXPath.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\AVTPartXPath.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Constants.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Constants.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\CountersTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\CountersTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\DecimalToRoman.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyImport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyImport.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyTemplates.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemApplyTemplates.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttribute.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttribute.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttributeSet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemAttributeSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCallTemplate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCallTemplate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemChoose.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemChoose.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemComment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemComment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopy.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopyOf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemCopyOf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemDecimalFormat.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemDecimalFormat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemEmpty.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemEmpty.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemExtensionCall.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemExtensionCall.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemFallback.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemFallback.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForEach.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForEach.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForwardCompatible.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemForwardCompatible.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemIf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemIf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemLiteralResult.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemLiteralResult.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemMessage.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemMessage.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemNumber.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemNumber.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemOtherwise.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemOtherwise.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemParam.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemParam.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemPI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemPI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemSort.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemSort.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplateElement.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTemplateElement.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemText.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemText.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTextLiteral.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemTextLiteral.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemUse.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemUse.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemValueOf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemValueOf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemVariable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemVariable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWhen.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWhen.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWithParam.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ElemWithParam.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionFunctionHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionFunctionHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionNSHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ExtensionNSHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionCurrent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionCurrent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionDocument.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionElementAvailable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionElementAvailable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFormatNumber.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFormatNumber.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFunctionAvailable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionFunctionAvailable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionGenerateID.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionGenerateID.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionKey.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionKey.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionSystemProperty.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionSystemProperty.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionUnparsedEntityURI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\FunctionUnparsedEntityURI.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\GenerateEvent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\GenerateEvent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\KeyDeclaration.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\KeyTable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\KeyTable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NamespacesHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NamespacesHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSorter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSorter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSortKey.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\NodeSortKey.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\OutputContextStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\OutputContextStack.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListener.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListenerDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ProblemListenerDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ResultNamespacesStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\ResultNamespacesStack.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\SelectionEvent.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\SelectionEvent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Stylesheet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\Stylesheet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetConstructionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContext.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContext.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContextDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetExecutionContextDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetHandler.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetHandler.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetRoot.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\StylesheetRoot.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TopLevelArg.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TopLevelArg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListener.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListener.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListenerDefault.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TraceListenerDefault.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\XSLT\TracerEvent.cpp"
- >
- </File>
- <File
[... 5484 lines stripped ...]
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Wed Nov 19 12:07:05 2008
New Revision: 719046
URL: http://svn.apache.org/viewvc?rev=719046&view=rev
Log:
More cleanup.
Removed:
xalan/c/trunk/src/xalanc/Include/XalanMemMgrHelper.hpp
xalan/c/trunk/src/xalanc/Include/XalanMemMngArrayAllocate.hpp
Modified:
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj (contents, props changed)
xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj (contents, props changed)
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.hpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctor.cpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatFactory.cpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp
xalan/c/trunk/src/xalanc/Include/XalanAutoPtr.hpp
xalan/c/trunk/src/xalanc/Include/XalanMemMgrAutoPtr.hpp
xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributeListImpl.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntry.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributeVectorEntryExtended.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/AttributesImpl.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp
xalan/c/trunk/src/xalanc/XPath/XPath.cpp
xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp
xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp
xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp
xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp
xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp
xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp
xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanCAPI.cpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultDocumentBuilder.cpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
xalan/c/trunk/src/xalanc/XalanTransformer/XalanTransformer.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCDATASectionWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesCommentWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMImplementationWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesNotationWrapper.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp Wed Nov 19 12:07:05 2008
@@ -183,14 +183,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp
# End Source File
# Begin Source File
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Wed Nov 19 12:07:05 2008
@@ -184,14 +184,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp
# End Source File
# Begin Source File
Modified: xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj Wed Nov 19 12:07:05 2008
@@ -339,9 +339,6 @@
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj Wed Nov 19 12:07:05
2008
@@ -266,9 +266,6 @@
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj Wed Nov 19 12:07:05 2008
@@ -244,21 +244,6 @@
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj Wed Nov 19 12:07:05 2008
@@ -241,21 +241,6 @@
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrAutoPtr.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj Wed Nov 19 12:07:05 2008
@@ -774,14 +774,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp"
>
</File>
Modified: xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj?rev=719046&r1=719045&r2=719046&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj Wed Nov 19 12:07:05 2008
@@ -416,14 +416,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMgrHelper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\Include\XalanMemMngArrayAllocate.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanMemoryManagement.hpp"
>
</File>
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Tue Nov 18 16:52:46 2008
New Revision: 718827
URL: http://svn.apache.org/viewvc?rev=718827&view=rev
Log:
Fix for XALANC-684.
Modified:
xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp
xalan/c/trunk/src/xalanc/XPath/Function.cpp
xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
Modified: xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp?rev=718827&r1=718826&r2=718827&view=diff
==============================================================================
--- xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp (original)
+++ xalan/c/trunk/samples/SimpleXPathAPI/SimpleXPathAPI.cpp Tue Nov 18 16:52:46 2008
@@ -167,8 +167,12 @@
}
catch(const XSLException& theException)
{
+ XALAN_USING_XALAN(XalanDOMString)
+
+ XalanDOMString theError;
+
cerr << "XSL exception: "
- << theException.getMessage()
+ << theException.defaultFormat(theError)
<< endl;
theResult = -1;
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp?rev=718827&r1=718826&r2=718827&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.cpp Tue Nov 18 16:52:46 2008
@@ -86,7 +86,7 @@
-void
+XalanDOMString&
XSLException::defaultFormat(XalanDOMString& theBuffer) const
{
if (m_formatted == true)
@@ -103,10 +103,13 @@
getType(),
theBuffer);
}
+
+ return theBuffer;
}
-void
+
+XalanDOMString&
XSLException::defaultFormat(
const XalanDOMChar* theMessage,
const XalanDOMString::size_type theMessageLength,
@@ -183,6 +186,8 @@
theBuffer.append(theMessageBuffer);
theBuffer += XalanDOMChar(XalanUnicode::charRightParenthesis);
+
+ return theBuffer;
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp?rev=718827&r1=718826&r2=718827&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XSLException.hpp Tue Nov 18 16:52:46 2008
@@ -135,10 +135,10 @@
return m_memoryManager;
}
- void
+ XalanDOMString&
defaultFormat(XalanDOMString& theBuffer) const;
- static void
+ static XalanDOMString&
defaultFormat(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
@@ -147,19 +147,19 @@
const XalanDOMChar* theType,
XalanDOMString& theBuffer)
{
- defaultFormat(
- theMessage.c_str(),
- theMessage.size(),
- theURI.c_str(),
- theURI.size(),
- theLineNumber,
- theColumnNumber,
- theType,
- XalanDOMString::length(theType),
- theBuffer);
+ return defaultFormat(
+ theMessage.c_str(),
+ theMessage.size(),
+ theURI.c_str(),
+ theURI.size(),
+ theLineNumber,
+ theColumnNumber,
+ theType,
+ XalanDOMString::length(theType),
+ theBuffer);
}
- static void
+ static XalanDOMString&
defaultFormat(
const XalanDOMChar* theMessage,
const XalanDOMChar* theURI,
@@ -170,19 +170,19 @@
{
assert(theMessage != 0);
- defaultFormat(
- theMessage,
- XalanDOMString::length(theMessage),
- theURI,
- theURI == 0 ? 0 : XalanDOMString::length(theURI),
- theLineNumber,
- theColumnNumber,
- theType,
- theType == 0 ? 0 : XalanDOMString::length(theType),
- theBuffer);
+ return defaultFormat(
+ theMessage,
+ XalanDOMString::length(theMessage),
+ theURI,
+ theURI == 0 ? 0 : XalanDOMString::length(theURI),
+ theLineNumber,
+ theColumnNumber,
+ theType,
+ theType == 0 ? 0 : XalanDOMString::length(theType),
+ theBuffer);
}
- static void
+ static XalanDOMString&
defaultFormat(
const XalanDOMChar* theMessage,
const XalanDOMString::size_type theMessageLength,
Modified: xalan/c/trunk/src/xalanc/XPath/Function.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/Function.cpp?rev=718827&r1=718826&r2=718827&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/Function.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/Function.cpp Tue Nov 18 16:52:46 2008
@@ -21,6 +21,7 @@
+#include "XalanXPathException.hpp"
#include "XObjectFactory.hpp"
@@ -157,12 +158,19 @@
{
const GetCachedString theGuard(executionContext);
+ XalanDOMString& theErrorString = theGuard.get();
+
executionContext.problem(
XPathExecutionContext::eXPath,
XPathExecutionContext::eError,
- getError(theGuard.get()),
+ getError(theErrorString),
locator,
context);
+
+ throw XalanXPathException(
+ theErrorString,
+ theErrorString.getMemoryManager(),
+ locator);
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp?rev=718827&r1=718826&r2=718827&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp Tue Nov 18 16:52:46 2008
@@ -46,6 +46,7 @@
+#include "XalanXPathException.hpp"
#include "XObject.hpp"
#include "XObjectFactory.hpp"
#include "XPath.hpp"
@@ -467,6 +468,14 @@
locator,
sourceNode);
}
+
+ if (classification == eError)
+ {
+ throw XalanXPathException(
+ msg,
+ getMemoryManager(),
+ locator);
+ }
}
@@ -487,6 +496,14 @@
msg,
sourceNode);
}
+
+ if (classification == eError)
+ {
+ throw XalanXPathException(
+ msg,
+ getMemoryManager(),
+ 0);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Mon Nov 3 11:01:16 2008
New Revision: 710130
URL: http://svn.apache.org/viewvc?rev=710130&view=rev
Log:
Use GCC as the default compiler. Bump optimization level to 3 for GCC and the HP compiler.
Modified:
xalan/c/trunk/runConfigure
Modified: xalan/c/trunk/runConfigure
URL: http://svn.apache.org/viewvc/xalan/c/trunk/runConfigure?rev=710130&r1=710129&r2=710130&view=diff
==============================================================================
--- xalan/c/trunk/runConfigure (original)
+++ xalan/c/trunk/runConfigure Mon Nov 3 11:01:16 2008
@@ -192,6 +192,8 @@
fi
# Set up the default values for each parameter
+ccompiler=gcc # Use GCC as the default compiler
+cppcompiler=g++ # Use GCC as the default compiler
debug=off # by default debug is off
bitsToBuild=32 # by default 32 bit build assumed
transcoder=default # by default use default transcoder
@@ -361,11 +363,9 @@
elif test $platform = "os390"; then
debugflag="-DNDEBUG";
elif test $platform = "linux"; then
- if test $cppcompiler = "icpc"; then
- debugflag="-O3 -DNDEBUG";
- else
- debugflag="-O2 -DNDEBUG";
- fi
+ debugflag="-O3 -DNDEBUG";
+ elif test $cppcompiler = "aCC"; then
+ debugflag="+O3 -DNDEBUG";
else
debugflag="-O -DNDEBUG";
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Nov 1 13:05:11 2008
New Revision: 709768
URL: http://svn.apache.org/viewvc?rev=709768&view=rev
Log:
Updated Xalan library version.
Modified:
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp?rev=709768&r1=709767&r2=709768&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Sat Nov 1 13:05:11 2008
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_10.dll" /implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_11.dll" /implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win32 Debug"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_10D.dll" /implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib"
/pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_11D.dll" /implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib"
/pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Release"
@@ -110,7 +110,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib /nologo /dll /pdb:none
/machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_10.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib /nologo /dll /pdb:none
/machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_11.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Debug"
@@ -136,7 +136,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_10D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_11D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Nov 1 12:42:08 2008
New Revision: 709761
URL: http://svn.apache.org/viewvc?rev=709761&view=rev
Log:
Updated VS6 message library version numbers.
Modified:
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp?rev=709761&r1=709760&r2=709761&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Sat Nov 1 12:42:08 2008
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_10.lib icuuc.lib icuin.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_10.dll" /implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_10.dll" /implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win32 Debug"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_3D.lib XalanMessages_1_10D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_10D.dll" /implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib"
/pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_10D.dll" /implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib"
/pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Release"
@@ -110,7 +110,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_10.lib icuuc.lib icuin.lib /nologo /dll /pdb:none
/machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_10.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib icuuc.lib icuin.lib /nologo /dll /pdb:none
/machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_10.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Debug"
@@ -136,7 +136,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_3D.lib XalanMessages_1_10D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_10D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib icuucd.lib icuind.lib /nologo /dll /debug
/machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_10D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
/libpath:"$(ICUROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp?rev=709759&r1=709758&r2=709759&view=diff ============================================================================== --- xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp (original) +++ xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp Sat Nov 1 12:37:26 2008 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\TraceListen.exe" /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\TraceListen.exe" /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "TraceListen - Win32 Debug" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\TraceListen_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\TraceListen_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "TraceListen - Win64 Release" @@ -103,7 +103,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\TraceListen.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\TraceListen.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "TraceListen - Win64 Debug" @@ -127,7 +127,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\TraceListen.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\TraceListen.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ENDIF Modified: xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp?rev=709759&r1=709758&r2=709759&view=diff ============================================================================== --- xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp (original) +++ xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp Sat Nov 1 12:37:26 2008 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\TransformToXercesDOM.exe" /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\TransformToXercesDOM.exe" /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "TransformToXercesDOM - Win32 Debug" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\TransformToXercesDOM_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\TransformToXercesDOM_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "TransformToXercesDOM - Win64 Release" @@ -103,7 +103,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\TransformToXercesDOM.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\TransformToXercesDOM.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "TransformToXercesDOM - Win64 Debug" @@ -127,7 +127,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\TransformToXercesDOM.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\TransformToXercesDOM.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ENDIF Modified: xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp?rev=709759&r1=709758&r2=709759&view=diff ============================================================================== --- xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp (original) +++ xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp Sat Nov 1 12:37:26 2008 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\UseStylesheetParam.exe" /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\UseStylesheetParam.exe" /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "UseStylesheetParam - Win32 Debug" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\UseStylesheetParam_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\UseStylesheetParam_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "UseStylesheetParam - Win64 Release" @@ -103,7 +103,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\UseStylesheetParam.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\UseStylesheetParam.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "UseStylesheetParam - Win64 Debug" @@ -127,7 +127,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\UseStylesheetParam.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\UseStylesheetParam.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ENDIF Modified: xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp?rev=709759&r1=709758&r2=709759&view=diff ============================================================================== --- xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp (original) +++ xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp Sat Nov 1 12:37:26 2008 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\XPathWrapper.exe" /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\XPathWrapper.exe" /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XPathWrapper - Win32 Debug" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\XPathWrapper_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\XPathWrapper_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XPathWrapper - Win64 Release" @@ -103,7 +103,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\XPathWrapper.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\XPathWrapper.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XPathWrapper - Win64 Debug" @@ -127,7 +127,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\XPathWrapper.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\XPathWrapper.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ENDIF Modified: xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp?rev=709759&r1=709758&r2=709759&view=diff ============================================================================== --- xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp (original) +++ xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp Sat Nov 1 12:37:26 2008 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\XalanTransform.exe" /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\XalanTransform.exe" /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XalanTransform - Win32 Debug" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\XalanTransform_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\XalanTransform_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XalanTransform - Win64 Release" @@ -103,7 +103,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XalanTransform - Win64 Debug" @@ -127,7 +127,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ENDIF Modified: xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp?rev=709759&r1=709758&r2=709759&view=diff ============================================================================== --- xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp (original) +++ xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp Sat Nov 1 12:37:26 2008 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\XalanTransformerCallback.exe" /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\XalanTransformerCallback.exe" /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XalanTransformerCallback - Win32 Debug" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\XalanTransformerCallback_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\XalanTransformerCallback_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XalanTransformerCallback - Win64 Release" @@ -103,7 +103,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransformerCallback.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransformerCallback.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ELSEIF "$(CFG)" == "XalanTransformerCallback - Win64 Debug" @@ -127,7 +127,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransformerCallback.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" +# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\XalanTransformerCallback.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib" !ENDIF --------------------------------------------------------------------- To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Nov 1 12:37:26 2008
New Revision: 709759
URL: http://svn.apache.org/viewvc?rev=709759&view=rev
Log:
Updated VS6 Xerces-C library version numbers.
Modified:
xalan/c/trunk/Tests/Compare/compare.dsp
xalan/c/trunk/Tests/Dom2Dom/Dom2Dom.dsp
xalan/c/trunk/Tests/Errortests/Errortests.dsp
xalan/c/trunk/Tests/Extensions/extensions.dsp
xalan/c/trunk/Tests/InputSource/inputsource.dsp
xalan/c/trunk/Tests/Memory/Memory.dsp
xalan/c/trunk/Tests/Params/Params.dsp
xalan/c/trunk/Tests/PerfT/PerfT.dsp
xalan/c/trunk/Tests/Performance/perf.dsp
xalan/c/trunk/Tests/Transformer/Transformer.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/CompileStylesheet/CompileStylesheet.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/DocumentBuilder/DocumentBuilder.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/ParsedSourceWrappers/ParsedSourceWrappers.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/SimpleTransform/SimpleTransform.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathCAPI/SimpleXPathCAPI.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/StreamTransform/StreamTransform.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/TraceListen/TraceListen.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/TransformToXercesDOM/TransformToXercesDOM.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/UseStylesheetParam/UseStylesheetParam.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/XPathWrapper/XPathWrapper.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransform/XalanTransform.dsp
xalan/c/trunk/samples/Projects/Win32/VC6/XalanTransformerCallback/XalanTransformerCallback.dsp
Modified: xalan/c/trunk/Tests/Compare/compare.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Compare/compare.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Compare/compare.dsp (original)
+++ xalan/c/trunk/Tests/Compare/compare.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "compare - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "compare - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/perft.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "compare - Win64 Release"
@@ -130,7 +130,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "compare - Win64 Debug"
@@ -154,7 +154,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Dom2Dom/Dom2Dom.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Dom2Dom/Dom2Dom.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Dom2Dom/Dom2Dom.dsp (original)
+++ xalan/c/trunk/Tests/Dom2Dom/Dom2Dom.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "dom2dom - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "dom2dom - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/dom2dom.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "dom2dom - Win64 Release"
@@ -129,7 +129,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "dom2dom - Win64 Debug"
@@ -153,7 +153,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Errortests/Errortests.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Errortests/Errortests.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Errortests/Errortests.dsp (original)
+++ xalan/c/trunk/Tests/Errortests/Errortests.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Errortests - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Errortests - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/perft.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Errortests - Win64 Release"
@@ -130,7 +130,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "Errortests - Win64 Debug"
@@ -154,7 +154,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Extensions/extensions.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Extensions/extensions.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Extensions/extensions.dsp (original)
+++ xalan/c/trunk/Tests/Extensions/extensions.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "extensions - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "extensions - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/extensions.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "extensions - Win64 Release"
@@ -129,7 +129,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "extensions - Win64 Debug"
@@ -153,7 +153,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/InputSource/inputsource.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/InputSource/inputsource.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/InputSource/inputsource.dsp (original)
+++ xalan/c/trunk/Tests/InputSource/inputsource.dsp Sat Nov 1 12:37:26 2008
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "inputsource - Win32 Debug"
@@ -77,7 +77,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "inputsource - Win32 Release with symbols"
@@ -102,7 +102,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/inputsource.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "inputsource - Win64 Release"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "inputsource - Win64 Debug"
@@ -151,7 +151,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Memory/Memory.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Memory/Memory.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Memory/Memory.dsp (original)
+++ xalan/c/trunk/Tests/Memory/Memory.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /out:"..\..\Build\Win32\VC6\Release/stressmem.exe" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /out:"..\..\Build\Win32\VC6\Release/stressmem.exe" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Memory - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /out:"..\..\Build\Win32\VC6\Debug/stressmem.exe" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /out:"..\..\Build\Win32\VC6\Debug/stressmem.exe" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Memory - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/stressmem.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /out:"..\..\Build\Win32\VC6\Release.symbols/stressmem.exe" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /out:"..\..\Build\Win32\VC6\Release.symbols/stressmem.exe" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Memory - Win64 Release"
@@ -130,7 +130,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /out:"..\..\Build\Win64\VC6\Release/stressmem.exe" /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /out:"..\..\Build\Win64\VC6\Release/stressmem.exe" /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "Memory - Win64 Debug"
@@ -154,7 +154,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /out:"..\..\Build\Win64\VC6\Debug/stressmem.exe" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /out:"..\..\Build\Win64\VC6\Debug/stressmem.exe" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Params/Params.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Params/Params.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Params/Params.dsp (original)
+++ xalan/c/trunk/Tests/Params/Params.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Params - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Params - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/Params.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Params - Win64 Release"
@@ -130,7 +130,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "Params - Win64 Debug"
@@ -154,7 +154,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/PerfT/PerfT.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/PerfT/PerfT.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/PerfT/PerfT.dsp (original)
+++ xalan/c/trunk/Tests/PerfT/PerfT.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "PerfT - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "PerfT - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/perft.exe"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "PerfT - Win64 Release"
@@ -130,7 +130,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "PerfT - Win64 Debug"
@@ -154,7 +154,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Performance/perf.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Performance/perf.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Performance/perf.dsp (original)
+++ xalan/c/trunk/Tests/Performance/perf.dsp Sat Nov 1 12:37:26 2008
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "perf - Win32 Debug"
@@ -77,7 +77,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
# SUBTRACT LINK32 /incremental:no
!ELSEIF "$(CFG)" == "perf - Win32 Release with symbols"
@@ -104,7 +104,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\Harness\Release\\"
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "perf - Win64 Release"
@@ -129,7 +129,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "perf - Win64 Debug"
@@ -154,7 +154,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /incremental:no
!ENDIF
Modified: xalan/c/trunk/Tests/Transformer/Transformer.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Transformer/Transformer.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Transformer/Transformer.dsp (original)
+++ xalan/c/trunk/Tests/Transformer/Transformer.dsp Sat Nov 1 12:37:26 2008
@@ -57,7 +57,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "Transformer - Win32 Debug"
@@ -83,7 +83,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Transformer - Win32 Release with symbols"
@@ -113,7 +113,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /fixed:no
!ELSEIF "$(CFG)" == "Transformer - Win64 Release"
@@ -140,7 +140,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "Transformer - Win64 Debug"
@@ -166,7 +166,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/CompileStylesheet/CompileStylesheet.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/CompileStylesheet/CompileStylesheet.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/CompileStylesheet/CompileStylesheet.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/CompileStylesheet/CompileStylesheet.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\CompileStylesheet.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\CompileStylesheet.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "CompileStylesheet - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\CompileStylesheet_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\CompileStylesheet_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "CompileStylesheet - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\CompileStylesheet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\CompileStylesheet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "CompileStylesheet - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\CompileStylesheet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\CompileStylesheet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/DocumentBuilder/DocumentBuilder.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/DocumentBuilder/DocumentBuilder.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/DocumentBuilder/DocumentBuilder.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/DocumentBuilder/DocumentBuilder.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\DocumentBuilder.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\DocumentBuilder.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "DocumentBuilder - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\DocumentBuilder_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\DocumentBuilder_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "DocumentBuilder - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\DocumentBuilder.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\DocumentBuilder.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "DocumentBuilder - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\DocumentBuilder.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\DocumentBuilder.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\ExternalFunction.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\ExternalFunction.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ExternalFunction - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\ExternalFunction_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\ExternalFunction_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ExternalFunction - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\ExternalFunction.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\ExternalFunction.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ExternalFunction - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\ExternalFunction.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\ExternalFunction.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/ParsedSourceWrappers/ParsedSourceWrappers.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/ParsedSourceWrappers/ParsedSourceWrappers.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/ParsedSourceWrappers/ParsedSourceWrappers.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/ParsedSourceWrappers/ParsedSourceWrappers.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\ParsedSourceWrappers.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\ParsedSourceWrappers.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ParsedSourceWrappers - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\ParsedSourceWrappers_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\ParsedSourceWrappers_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ParsedSourceWrappers - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\ParsedSourceWrappers.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\ParsedSourceWrappers.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ParsedSourceWrappers - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\ParsedSourceWrappers.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\ParsedSourceWrappers.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SerializeNodeSet.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SerializeNodeSet.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SerializeNodeSet - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SerializeNodeSet_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SerializeNodeSet_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SerializeNodeSet - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SerializeNodeSet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SerializeNodeSet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SerializeNodeSet - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SerializeNodeSet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SerializeNodeSet.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/SimpleTransform/SimpleTransform.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/SimpleTransform/SimpleTransform.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/SimpleTransform/SimpleTransform.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/SimpleTransform/SimpleTransform.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SimpleTransform.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SimpleTransform.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleTransform - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SimpleTransform_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SimpleTransform_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleTransform - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SimpleTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SimpleTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleTransform - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SimpleTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SimpleTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathAPI.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathAPI.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleXPathAPI - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathAPI_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathAPI_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleXPathAPI - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleXPathAPI - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathCAPI/SimpleXPathCAPI.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathCAPI/SimpleXPathCAPI.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathCAPI/SimpleXPathCAPI.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/SimpleXPathCAPI/SimpleXPathCAPI.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathCAPI.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathCAPI.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleXPathCAPI - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathCAPI_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\SimpleXPathCAPI_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleXPathCAPI - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathCAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathCAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "SimpleXPathCAPI - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathCAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\SimpleXPathCAPI.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/StreamTransform/StreamTransform.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/StreamTransform/StreamTransform.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/StreamTransform/StreamTransform.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/StreamTransform/StreamTransform.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\StreamTransform.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\StreamTransform.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "StreamTransform - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\StreamTransform_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\StreamTransform_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "StreamTransform - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\StreamTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\StreamTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "StreamTransform - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\StreamTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\StreamTransform.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
Modified: xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp?rev=709759&r1=709758&r2=709759&view=diff
==============================================================================
--- xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp (original)
+++ xalan/c/trunk/samples/Projects/Win32/VC6/ThreadSafe/ThreadSafe.dsp Sat Nov 1 12:37:26 2008
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\ThreadSafe.exe" /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\..\..\bin\ThreadSafe.exe" /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ThreadSafe - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\ThreadSafe_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\..\..\bin\ThreadSafe_D.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ThreadSafe - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\ThreadSafe.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /subsystem:console /machine:IA64 /out:"..\..\..\..\..\bin\ThreadSafe.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ELSEIF "$(CFG)" == "ThreadSafe - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\ThreadSafe.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /subsystem:console /debug /machine:IA64 /out:"..\..\..\..\..\bin\ThreadSafe.exe" /pdbtype:sept /libpath:"..\..\..\..\..\lib"
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Sat Nov 1 12:33:28 2008
New Revision: 709758
URL: http://svn.apache.org/viewvc?rev=709758&view=rev
Log:
Clean up for VS6. Updated version numbers for libraries and removed obsolete configurations.
Fixed a few compiler errors due to compiler limitations.
Modified:
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
xalan/c/trunk/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp
xalan/c/trunk/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp
xalan/c/trunk/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp
xalan/c/trunk/Projects/Win32/VC6/Utils/Localization/Localization.dsp
xalan/c/trunk/Tests/Conf/conf.dsp
xalan/c/trunk/Tests/Threads/ThreadTest.dsp
xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp
xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp Sat Nov 1 12:33:28 2008
@@ -19,7 +19,6 @@
!MESSAGE
!MESSAGE "AllInOne - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "AllInOne - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "AllInOne - Win32 Release with symbols" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "AllInOne - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "AllInOne - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
@@ -56,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_10.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_10.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_11.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "AllInOne - Win32 Debug"
@@ -82,36 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_3D.lib XalanMessages_1_10D.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_10D.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "AllInOne - Win32 Release with symbols"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseWithSymbols"
-# PROP BASE Intermediate_Dir "ReleaseWithSymbols"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\Build\Win32\VC6\Release.symbols"
-# PROP Intermediate_Dir "..\..\..\..\Build\Win32\VC6\Release.symbols\AllInOne"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\"
/I "..\..\..\..\Build\Win32\VC6\Release.symbols\Nls\Include" /D "NDEBUG" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\Build\Win32\VC6\Release.symbols\Nls\Include"
/I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /D "NDEBUG" /D "XALAN_BUILD_DLL" /D "_MBCS" /D "XALAN_INMEM_MSG_LOADER"
/D "ITERATIVE_EXECUTION" /FD /Zm250 /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo
/dll /debug /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_10S.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_10S.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1S.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release.symbols" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_11D.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOne - Win64 Release"
@@ -139,7 +109,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_3.lib XalanMessages_1_10.lib /nologo /dll /pdb:none /machine:IX86 /nodefaultlib:"libmmd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_10.dll" /implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"..\..\..\..\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib XalanMessages_1_11.lib /nologo /dll /pdb:none /machine:IX86 /nodefaultlib:"libmmd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_11.dll" /implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"..\..\..\..\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "AllInOne - Win64 Debug"
@@ -165,7 +135,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_3D.lib XalanMessages_1_10D.lib /nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmdd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_10D.dll" /implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib"
/pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"..\..\..\..\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib XalanMessages_1_11D.lib /nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmdd.lib"
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_11D.dll" /implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib"
/pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"..\..\..\..\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -174,7 +144,6 @@
# Name "AllInOne - Win32 Release"
# Name "AllInOne - Win32 Debug"
-# Name "AllInOne - Win32 Release with symbols"
# Name "AllInOne - Win64 Release"
# Name "AllInOne - Win64 Debug"
# Begin Group "Include"
Modified: xalan/c/trunk/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/ExternalFunction/ExternalFunction.dsp Sat Nov 1 12:33:28
2008
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\Build\Win32\VC6\Release\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS"
/FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\Build\Win32\VC6\Debug\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD
/GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\Build\Win64\VC6\Release\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS"
/FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -118,7 +118,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\Build\Win64\VC6\Debug\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD
/GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: xalan/c/trunk/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/SerializeNodeSet/SerializeNodeSet.dsp Sat Nov 1 12:33:28
2008
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /ZI /O2 /Ob2 /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\Build\Win32\VC6\Release\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS"
/FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\Build\Win32\VC6\Debug\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD
/GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\Build\Win64\VC6\Release\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS"
/FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -118,7 +118,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\Build\Win64\VC6\Debug\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD
/GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: xalan/c/trunk/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/SimpleXPathAPI/SimpleXPathAPI.dsp Sat Nov 1 12:33:28
2008
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\Build\Win32\VC6\Release\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS"
/FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\Build\Win32\VC6\Debug\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD
/GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I
"$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\Build\Win64\VC6\Release\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS"
/FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -118,7 +118,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\src" /I "$(XERCESCROOT)\src"
/I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\Build\Win64\VC6\Debug\Nls\Include"
/I "..\..\..\..\src" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD
/GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: xalan/c/trunk/Projects/Win32/VC6/Utils/Localization/Localization.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/Utils/Localization/Localization.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/Utils/Localization/Localization.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/Utils/Localization/Localization.dsp Sat Nov 1 12:33:28
2008
@@ -8,18 +8,17 @@
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "BuildMessages.mak".
+!MESSAGE NMAKE /f "Localization.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "BuildMessages.mak" CFG="Localization - Win32 Release"
+!MESSAGE NMAKE /f "Localization.mak" CFG="Localization - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Localization - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "Localization - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "Localization - Win32 Release with symbols" (based on "Win32 (x86) External Target")
!MESSAGE "Localization - Win64 Release" (based on "Win64 (x86) External Target")
!MESSAGE "Localization - Win64 Debug" (based on "Win64 (x86) External Target")
!MESSAGE
@@ -53,20 +52,6 @@
# PROP Rebuild_Opt "/a"
# PROP Target_File "Localization"
-!ELSEIF "$(CFG)" == "Localization - Win32 Release with symbols"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem LOCALE=en_US"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Localization"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem CFG=Release.symbols LOCALE=en_US"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Localization"
-
!ELSEIF "$(CFG)" == "Localization - Win64 Release"
# PROP BASE Use_MFC 0
@@ -101,7 +86,6 @@
# Name "Localization - Win32 Release"
# Name "Localization - Win32 Debug"
-# Name "Localization - Win32 Release with symbols"
# Name "Localization - Win64 Release"
# Name "Localization - Win64 Debug"
@@ -109,12 +93,6 @@
!ELSEIF "$(CFG)" == "Localization - Win32 Debug"
-!ELSEIF "$(CFG)" == "Localization - Win32 Release with symbols"
-
-!ELSEIF "$(CFG)" == "Localization - Win64 Release"
-
-!ELSEIF "$(CFG)" == "Localization - Win64 Debug"
-
!ENDIF
# Begin Source File
Modified: xalan/c/trunk/Tests/Conf/conf.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Conf/conf.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Conf/conf.dsp (original)
+++ xalan/c/trunk/Tests/Conf/conf.dsp Sat Nov 1 12:33:28 2008
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "conf - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib"
!ELSEIF "$(CFG)" == "conf - Win64 Release"
@@ -103,7 +103,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "conf - Win64 Debug"
@@ -127,7 +127,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ENDIF
Modified: xalan/c/trunk/Tests/Threads/ThreadTest.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Threads/ThreadTest.dsp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Threads/ThreadTest.dsp (original)
+++ xalan/c/trunk/Tests/Threads/ThreadTest.dsp Sat Nov 1 12:33:28 2008
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release"
/libpath:"$(XERCESCROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ThreadTest - Win32 Debug"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ThreadTest - Win64 Release"
@@ -105,7 +105,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:IX86
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
!ELSEIF "$(CFG)" == "ThreadTest - Win64 Debug"
@@ -130,7 +130,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_3D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:IX86
/pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug"
/libpath:"$(XERCESCROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
Modified: xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp (original)
+++ xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp Sat Nov 1 12:33:28 2008
@@ -41,6 +41,8 @@
#include <stdlib.h>
+XALAN_USING_XERCES(MemoryManager)
+
class XalanMemoryManagerImpl : public XALAN_CPP_NAMESPACE_QUALIFIER XalanMemoryManager
{
public:
Modified: xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp?rev=709758&r1=709757&r2=709758&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp Sat Nov 1 12:33:28 2008
@@ -826,6 +826,8 @@
#if defined(XALAN_WINDOWS)
+XALAN_USING_XERCES(MemoryManager)
+
class WindowsMemoryManager : public XALAN_CPP_NAMESPACE_QUALIFIER XalanMemoryManager
{
public:
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Thu Oct 30 17:37:03 2008
New Revision: 709312
URL: http://svn.apache.org/viewvc?rev=709312&view=rev
Log:
Fixed bugs where early exits would leave file handles open.
Modified:
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=709312&r1=709311&r2=709312&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Thu Oct 30 17:37:03 2008
@@ -1016,6 +1016,8 @@
const char* goldFile,
const char* outputFile)
{
+ bool retValue = true;
+
const unsigned long maxBuffer = 132;
char rline[maxBuffer]; // declare buffers to hold single line from file
@@ -1032,94 +1034,96 @@
FILE* const result = fopen(outputFile, "r");
FILE* const gold = fopen(goldFile, "r");
- // If the result file fails to open report this as a failure.
if (!result)
{
+ // If the result file fails to open report this as a failure.
data.msg = "No Result (Transform failed)";
data.fail += 1;
- return false;
+ retValue = false;
}
-
- // If the gold file fails to open report this as ambiguous.
- if (!gold)
+ else if (!gold)
{
+ // If the gold file fails to open report this as ambiguous.
data.msg = "No Gold file";
data.nogold += 1;
- return false;
+ retValue = false;
}
-
- // Start file comparison, line by line..
- while(!feof(result) && !feof(gold))
+ else
{
- gline[0] = '\0';
- rline[0] = '\0';
-
- fgets(gline, sizeof(gline), gold );
- fgets(rline, sizeof(rline), result );
- sprintf(temp,"%d",lineNum);
-
- if (ferror(gold) || ferror(result))
+ // Start file comparison, line by line..
+ while(!feof(result) && !feof(gold) && retValue == true)
{
- data.msg = "Read Error - Gold/Result file";
- data.currentNode = XalanDOMString("Line: ", getMemoryManager());
- data.currentNode += XalanDOMString(temp, getMemoryManager());
- return false;
- }
+ gline[0] = '\0';
+ rline[0] = '\0';
- // Compare the lines character by charcter ....
- XalanSize_t i = 0;
- while(i < strlen(gline))
- {
- if (gline[i] == rline[i])
+ fgets(gline, sizeof(gline), gold );
+ fgets(rline, sizeof(rline), result );
+ sprintf(temp,"%d",lineNum);
+
+ if (ferror(gold) || ferror(result))
{
- i++;
+ data.msg = "Read Error - Gold/Result file";
+ data.currentNode = XalanDOMString("Line: ", getMemoryManager());
+ data.currentNode += XalanDOMString(temp, getMemoryManager());
+ retValue = false;
}
else
- { // If there is a mismatch collect up the fail data and return false. To
ensure that
- // the results can be seen in the browser enclose the actual/expected in
CDATA Sections.
-
- data.msg = "Text based comparison failure";
-
- try
- {
- data.expected += XalanDOMString(gline, getMemoryManager());
- }
- catch(const XalanDOMString::TranscodingError&)
+ {
+ // Compare the lines character by charcter ....
+ XalanSize_t i = 0;
+ while(i < strlen(gline) && retValue == true)
{
- data.expected +=
- XalanDOMString(
- "Unable to transcode expected data.",
- getMemoryManager());
- }
+ if (gline[i] == rline[i])
+ {
+ ++i;
+ }
+ else
+ { // If there is a mismatch collect up the fail data and return false.
To ensure that
+ // the results can be seen in the browser enclose the actual/expected
in CDATA Sections.
+
+ data.msg = "Text based comparison failure";
+
+ try
+ {
+ data.expected += XalanDOMString(gline, getMemoryManager());
+ }
+ catch(const XalanDOMString::TranscodingError&)
+ {
+ data.expected +=
+ XalanDOMString(
+ "Unable to transcode expected data.",
+ getMemoryManager());
+ }
+
+ try
+ {
+ data.actual += XalanDOMString(rline, getMemoryManager());
+ }
+ catch(const XalanDOMString::TranscodingError&)
+ {
+ data.actual +=
+ XalanDOMString(
+ "Unable to transcode actual data.",
+ getMemoryManager());
+ }
+
+ data.currentNode = XalanDOMString("Line: ", getMemoryManager());
+ data.currentNode += XalanDOMString(temp, getMemoryManager());
+ data.fail += 1;
- try
- {
- data.actual += XalanDOMString(rline, getMemoryManager());
- }
- catch(const XalanDOMString::TranscodingError&)
- {
- data.actual +=
- XalanDOMString(
- "Unable to transcode actual data.",
- getMemoryManager());
+ retValue = false;
+ }
}
- data.currentNode = XalanDOMString("Line: ", getMemoryManager());
- data.currentNode += XalanDOMString(temp, getMemoryManager());
- data.fail += 1;
- fclose(result);
- fclose(gold);
- return false;
+ ++lineNum;
}
}
-
- lineNum += 1;
}
fclose(result);
fclose(gold);
- return true;
+ return retValue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org
Author: dbertoni
Date: Thu Oct 30 17:36:28 2008
New Revision: 709311
URL: http://svn.apache.org/viewvc?rev=709311&view=rev
Log:
Fixed typo in macro.
Modified:
xalan/c/trunk/samples/ThreadSafe/ThreadSafe.cpp
Modified: xalan/c/trunk/samples/ThreadSafe/ThreadSafe.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/ThreadSafe/ThreadSafe.cpp?rev=709311&r1=709310&r2=709311&view=diff
==============================================================================
--- xalan/c/trunk/samples/ThreadSafe/ThreadSafe.cpp (original)
+++ xalan/c/trunk/samples/ThreadSafe/ThreadSafe.cpp Thu Oct 30 17:36:28 2008
@@ -185,7 +185,7 @@
outputMessage(theThreadID, "Finishing");
-#if defined(WINDOWS_THREAD_FUNCTION)
+#if defined(WINDOWS_THREAD_FUNCTIONS)
return theResult;
#elif defined(XALAN_POSIX2_AVAILABLE)
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org