mhoyt 2004/06/28 07:19:58
Modified: c/src/xalanc/Include XalanObjectStackCache.hpp
c/src/xalanc/XSLT ElemForEach.cpp ElemTemplateElement.cpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
Log:
Fix compiler warnings related to iterative stylesheet execution project
Revision Changes Path
1.2 +2 -2 xml-xalan/c/src/xalanc/Include/XalanObjectStackCache.hpp
Index: XalanObjectStackCache.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanObjectStackCache.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanObjectStackCache.hpp 28 Jun 2004 04:20:32 -0000 1.1
+++ XalanObjectStackCache.hpp 28 Jun 2004 14:19:57 -0000 1.2
@@ -110,7 +110,7 @@
void
reset()
{
- VectorType::iterator iterator;
+ typename VectorType::iterator iterator;
for (iterator = m_stack.begin(); iterator < m_stack.end();
iterator++)
{
@@ -137,7 +137,7 @@
// Data members...
VectorType m_stack;
- VectorType::size_type m_numObjectsOnStack;
+ typename VectorType::size_type m_numObjectsOnStack;
};
1.12 +1 -2 xml-xalan/c/src/xalanc/XSLT/ElemForEach.cpp
Index: ElemForEach.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemForEach.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemForEach.cpp 28 Jun 2004 04:20:32 -0000 1.11
+++ ElemForEach.cpp 28 Jun 2004 14:19:57 -0000 1.12
@@ -188,11 +188,10 @@
executionContext.pushCurrentTemplate(0);
const NodeRefListBase * nodeList =
createSelectedAndSortedNodeList(
executionContext);
- NodeRefListBase::size_type nNodes = nodeList->getLength();
executionContext.createAndPushNodesToTransformList(nodeList);
executionContext.pushContextNodeList(*nodeList);
- XalanNode* currentNode = executionContext.getNextNodeToTransform();
+ XalanNode* currentNode =
executionContext.getNextNodeToTransform();
if (currentNode == 0)
{
return 0;
1.18 +0 -6 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ElemTemplateElement.cpp 28 Jun 2004 05:06:09 -0000 1.17
+++ ElemTemplateElement.cpp 28 Jun 2004 14:19:57 -0000 1.18
@@ -259,13 +259,7 @@
if (0 == nextElement)
{
currentElement =
currentElement->getInvoker(executionContext);
-
- if (invoker == currentElement)
- {
- nextElement == 0;
- }
}
-
}
currentElement = nextElement;
1.28 +8 -9
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StylesheetExecutionContextDefault.cpp 28 Jun 2004 04:20:33 -0000
1.27
+++ StylesheetExecutionContextDefault.cpp 28 Jun 2004 14:19:57 -0000
1.28
@@ -127,6 +127,10 @@
m_countersTable(),
m_sourceTreeResultTreeFactory(),
m_currentTemplateStack(),
+ m_indentAmount(-1),
+ m_xresultTreeFragAllocator(eXResultTreeFragAllocatorBlockSize),
+ m_documentFragmentAllocator(eDocumentFragmentAllocatorBlockSize),
+ m_documentAllocator(eDocumentAllocatorBlockSize),
m_copyTextNodesOnlyStack(),
m_modeStack(),
m_currentIndexStack(),
@@ -149,15 +153,10 @@
m_formatterToSourceTreeCache(),
m_nodeSorterCache(),
#endif
- m_indentAmount(-1),
- m_xresultTreeFragAllocator(eXResultTreeFragAllocatorBlockSize),
- m_documentFragmentAllocator(eDocumentFragmentAllocatorBlockSize),
- m_documentAllocator(eDocumentAllocatorBlockSize),
m_usePerInstanceDocumentFactory(false),
m_escapeURLs(eEscapeURLsDefault),
m_omitMETATag(eOmitMETATagDefault),
m_hasStripOrPreserveSpace(false)
-
{
m_currentTemplateStack.push_back(0);
}
@@ -188,6 +187,10 @@
m_countersTable(),
m_sourceTreeResultTreeFactory(),
m_currentTemplateStack(),
+ m_indentAmount(-1),
+ m_xresultTreeFragAllocator(eXResultTreeFragAllocatorBlockSize),
+ m_documentFragmentAllocator(eDocumentFragmentAllocatorBlockSize),
+ m_documentAllocator(eDocumentAllocatorBlockSize),
m_copyTextNodesOnlyStack(),
m_modeStack(),
m_currentIndexStack(),
@@ -210,10 +213,6 @@
m_formatterToSourceTreeCache(),
m_nodeSorterCache(),
#endif
- m_indentAmount(-1),
- m_xresultTreeFragAllocator(eXResultTreeFragAllocatorBlockSize),
- m_documentFragmentAllocator(eDocumentFragmentAllocatorBlockSize),
- m_documentAllocator(eDocumentAllocatorBlockSize),
m_usePerInstanceDocumentFactory(false),
m_escapeURLs(eEscapeURLsDefault),
m_hasStripOrPreserveSpace(false)
1.23 +17 -17
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- StylesheetExecutionContextDefault.hpp 28 Jun 2004 04:20:33 -0000
1.22
+++ StylesheetExecutionContextDefault.hpp 28 Jun 2004 14:19:57 -0000
1.23
@@ -1206,18 +1206,6 @@
CurrentTemplateStackType m_currentTemplateStack;
-#if !defined(ITERATIVE_EXECUTION)
- typedef XalanObjectCacheDefault<FormatterToText>
FormatterToTextCacheType;
- typedef XalanObjectCacheDefault<FormatterToSourceTree>
FormatterToSourceTreeCacheType;
- typedef XalanObjectCacheDefault<NodeSorter>
NodeSorterCacheType;
-
- FormatterToTextCacheType m_formatterToTextCache;
-
- FormatterToSourceTreeCacheType m_formatterToSourceTreeCache;
-
- NodeSorterCacheType
m_nodeSorterCache;
-#endif
-
int
m_indentAmount;
XResultTreeFragAllocator
m_xresultTreeFragAllocator;
@@ -1226,23 +1214,35 @@
XalanSourceTreeDocumentAllocator m_documentAllocator;
- typedef XALAN_STD_QUALIFIER vector<bool>
BooleanStackType;
+ typedef XALAN_STD_QUALIFIER vector<bool>
BooleanStackType;
typedef XALAN_STD_QUALIFIER vector<const XalanQName*> ModeStackType;
- typedef XALAN_STD_QUALIFIER vector<int>
IntStackType;
+ typedef XALAN_STD_QUALIFIER vector<int> IntStackType;
BooleanStackType
m_copyTextNodesOnlyStack;
ModeStackType m_modeStack;
IntStackType
m_currentIndexStack;
+#if !defined(ITERATIVE_EXECUTION)
+ typedef XalanObjectCacheDefault<FormatterToText>
FormatterToTextCacheType;
+ typedef XalanObjectCacheDefault<FormatterToSourceTree>
FormatterToSourceTreeCacheType;
+ typedef XalanObjectCacheDefault<NodeSorter>
NodeSorterCacheType;
+
+ FormatterToTextCacheType m_formatterToTextCache;
+
+ FormatterToSourceTreeCacheType m_formatterToSourceTreeCache;
+
+ NodeSorterCacheType
m_nodeSorterCache;
+#endif
+
#if defined(ITERATIVE_EXECUTION)
- typedef XALAN_STD_QUALIFIER vector<XObjectPtr>
XObjectPtrStackType;
+ typedef XALAN_STD_QUALIFIER vector<XObjectPtr>
XObjectPtrStackType;
typedef XALAN_STD_QUALIFIER vector<ParamsVectorType>
ParamsVectorStackType;
- typedef XALAN_STD_QUALIFIER vector<UseAttributeSetIndexes>
UseAttributeSetIndexesStackType;
+ typedef XALAN_STD_QUALIFIER vector<UseAttributeSetIndexes>
UseAttributeSetIndexesStackType;
typedef XalanObjectStackCache<MutableNodeRefList>
MutableNodeRefListStackType;
typedef XalanObjectStackCache<XalanDOMString>
StringStackType;
typedef XalanObjectStackCache<FormatterToText>
FormatterToTextStackType;
- typedef XalanObjectStackCache<FormatterToSourceTree>
FormatterToSourceTreeStackType;
+ typedef XalanObjectStackCache<FormatterToSourceTree>
FormatterToSourceTreeStackType;
/*
* class to maintain the list of nodes to be transformed by an element
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
