You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@locus.apache.org on 2000/05/11 21:04:31 UTC
cvs commit: xml-xalan/c/src/XercesParserLiaison XercesToXalanNodeMap.cpp XercesToXalanNodeMap.hpp
dbertoni 00/05/11 12:04:31
Modified: c/src/XercesParserLiaison XercesToXalanNodeMap.cpp
XercesToXalanNodeMap.hpp
Log:
Cleaned up some code for compatibility.
Revision Changes Path
1.2 +4 -6 xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.cpp
Index: XercesToXalanNodeMap.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesToXalanNodeMap.cpp 2000/04/11 14:39:30 1.1
+++ XercesToXalanNodeMap.cpp 2000/05/11 19:04:31 1.2
@@ -87,15 +87,12 @@
+void
XercesToXalanNodeMap::addAssociation(
const DOM_Node& theXercesNode,
XalanNode* theXalanNode,
bool fAssignIndex)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::make_pair;
-#endif
-
// Space the indices, just in case nodes are
// added. With any luck, we may not need to
// reindex the nodes.
@@ -103,7 +100,7 @@
NodeImpl* const theImpl = XercesDOM_NodeHack::getImpl(theXercesNode);
- m_xercesMap.insert(make_pair(theImpl, theXalanNode));
+ m_xercesMap.insert(XercesNodeMapType::value_type(theImpl, theXalanNode));
try
{
@@ -126,7 +123,7 @@
}
}
- m_xalanMap.insert(make_pair(theXalanNode, XalanNodeMapEntryType(theImpl, theIndex)));
+ m_xalanMap.insert(XalanNodeMapType::value_type(theXalanNode, XalanNodeMapEntryType(theImpl, theIndex)));
}
catch(...)
{
@@ -138,6 +135,7 @@
+void
XercesToXalanNodeMap::clear()
{
m_xalanMap.clear();
1.3 +2 -0 xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.hpp
Index: XercesToXalanNodeMap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesToXalanNodeMap.hpp 2000/04/20 16:43:34 1.2
+++ XercesToXalanNodeMap.hpp 2000/05/11 19:04:31 1.3
@@ -88,11 +88,13 @@
~XercesToXalanNodeMap();
+ void
addAssociation(
const DOM_Node& theXercesNode,
XalanNode* theXalanNode,
bool fAssignIndex);
+ void
clear();
XalanNode*