jdonohue 00/04/20 04:44:30
Modified: c/src/XSLT ElemNumber.cpp ElemNumber.hpp
Log:
Removed extraneous consts
Revision Changes Path
1.11 +7 -16 xml-xalan/c/src/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemNumber.cpp 2000/04/19 15:59:25 1.10
+++ ElemNumber.cpp 2000/04/20 11:44:29 1.11
@@ -367,8 +367,8 @@
XalanDOMString
ElemNumber::getCountString(
StylesheetExecutionContext&
executionContext,
- XalanNode* const
/* sourceTree */,
- XalanNode* const
sourceNode) const
+ XalanNode*
/* sourceTree */,
+ XalanNode*
sourceNode) const
{
assert(sourceNode != 0);
IntArrayType numberList;
@@ -388,7 +388,7 @@
if(Constants::NUMBERLEVEL_ANY == m_level)
{
numberList.push_back(ctable.countNode(executionContext,
- const_cast<ElemNumber* const>(this), sourceNode));
+ const_cast<ElemNumber*>(this), sourceNode));
}
else
{
@@ -397,20 +397,11 @@
int lastIndex = ancestors.getLength();
if(lastIndex > 0)
{
- /*
- numberList.reserve(lastIndex+1);
- for(int i = lastIndex; i >= 0; i--)
- {
- const XalanNode* target =
ancestors.item(i);
- numberList[lastIndex-i] =
ctable.countNode(executionContext,
- const_cast<ElemNumber*
const>(this), target);
- }
- */
for(int i = 0; i < lastIndex; i++)
{
const XalanNode* target =
ancestors.item(lastIndex - i -1);
numberList.push_back(ctable.countNode(executionContext,
- const_cast<ElemNumber*
const>(this), target));
+
const_cast<ElemNumber*>(this), target));
}
}
}
@@ -1014,13 +1005,13 @@
* CountersTable Class Implementation
*/
-ElemNumber::CounterVectorType&
ElemNumber::CountersTable::getCounters(ElemNumber* const numberElem)
+ElemNumber::CounterVectorType&
ElemNumber::CountersTable::getCounters(ElemNumber* numberElem)
{
Ptr2CounterVectorMapType::iterator it = m_hashTable.find(numberElem);
return (m_hashTable.end() == it) ? putElemNumber(numberElem) :
(*it).second;
}
-ElemNumber::CounterVectorType&
ElemNumber::CountersTable::putElemNumber(ElemNumber* const numberElem)
+ElemNumber::CounterVectorType&
ElemNumber::CountersTable::putElemNumber(ElemNumber* numberElem)
{
#if !defined(XALAN_NO_NAMESPACES)
using std::make_pair;
@@ -1046,7 +1037,7 @@
*/
int ElemNumber::CountersTable::countNode(
StylesheetExecutionContext& support,
- ElemNumber* const numberElem,
+ ElemNumber* numberElem,
const XalanNode* const node)
{
int count = 0;
1.10 +6 -6 xml-xalan/c/src/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemNumber.hpp 2000/04/19 15:59:25 1.9
+++ ElemNumber.hpp 2000/04/20 11:44:30 1.10
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.9 2000/04/19 15:59:25 jdonohue Exp $
+ * $Id: ElemNumber.hpp,v 1.10 2000/04/20 11:44:30 jdonohue Exp $
*
* $State: Exp $
*
@@ -198,8 +198,8 @@
XalanDOMString
getCountString(
StylesheetExecutionContext&
executionContext,
- XalanNode* const
sourceTree,
- XalanNode* const
sourceNode) const;
+ XalanNode*
sourceTree,
+ XalanNode*
sourceNode) const;
/**
* Get the previous node to be counted.
@@ -456,7 +456,7 @@
*/
int CountersTable::countNode(
StylesheetExecutionContext& support,
- ElemNumber* const numberElem,
+ ElemNumber* numberElem,
const XalanNode* const node);
private:
@@ -465,14 +465,14 @@
* Get the list of counters that corresponds to
* the given ElemNumber object.
*/
- CounterVectorType& getCounters(ElemNumber* const
numberElem);
+ CounterVectorType& getCounters(ElemNumber*
numberElem);
/**
* Put a counter into the table and create an empty
* vector as it's value.
*/
- CounterVectorType& putElemNumber(ElemNumber* const
numberElem);
+ CounterVectorType& putElemNumber(ElemNumber*
numberElem);
/**
* Add a list of counted nodes that were built in
backwards document
