dbertoni 00/08/07 12:52:14
Modified: c/src/XSLT ElemLiteralResult.hpp ElemTemplateElement.hpp
KeyTable.hpp NodeSorter.cpp NodeSorter.hpp
Stylesheet.cpp Stylesheet.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
XSLTProcessorEnvSupportDefault.cpp
XSLTProcessorEnvSupportDefault.hpp
Log:
Fixes for AIX compiler issues.
Revision Changes Path
1.9 +2 -4 xml-xalan/c/src/XSLT/ElemLiteralResult.hpp
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemLiteralResult.hpp 2000/07/06 20:19:24 1.8
+++ ElemLiteralResult.hpp 2000/08/07 19:52:03 1.9
@@ -126,11 +126,9 @@
#if defined(XALAN_NO_NAMESPACES)
typedef vector<const AVT*> AVTVectorType;
typedef vector<XalanDOMString>
ExtensionElementPrefixesVectorType;
- typedef map<DOMString, DOMString> String2StringMapType;
#else
typedef std::vector<const AVT*> AVTVectorType;
typedef std::vector<XalanDOMString>
ExtensionElementPrefixesVectorType;
- typedef std::map<DOMString, DOMString> String2StringMapType;
#endif
/**
@@ -154,8 +152,8 @@
*/
void
ElemLiteralResult::processPrefixControl(
- const DOMString& localName,
- const DOMString& attrValue);
+ const XalanDOMString& localName,
+ const XalanDOMString& attrValue);
};
1.14 +1 -1 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemTemplateElement.hpp 2000/07/25 14:49:32 1.13
+++ ElemTemplateElement.hpp 2000/08/07 19:52:03 1.14
@@ -319,7 +319,7 @@
#if defined(XALAN_NO_NAMESPACES)
typedef vector<NameSpace> NamespaceVectorType;
- typedef map<XalanDOMString, XalanDOMString> String2StringMapType;
+ typedef map<XalanDOMString, XalanDOMString, less<XalanDOMString> >
String2StringMapType;
#else
typedef std::vector<NameSpace> NamespaceVectorType;
typedef std::map<XalanDOMString, XalanDOMString>
String2StringMapType;
1.6 +5 -3 xml-xalan/c/src/XSLT/KeyTable.hpp
Index: KeyTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyTable.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KeyTable.hpp 2000/04/11 15:09:28 1.5
+++ KeyTable.hpp 2000/08/07 19:52:04 1.6
@@ -58,7 +58,7 @@
#define XALAN_KEYTABLE_HEADER_GUARD
/**
- * $Id: KeyTable.hpp,v 1.5 2000/04/11 15:09:28 dbertoni Exp $
+ * $Id: KeyTable.hpp,v 1.6 2000/08/07 19:52:04 dbertoni Exp $
*
* $State: Exp $
*
@@ -184,10 +184,12 @@
#if defined(XALAN_NO_NAMESPACES)
typedef map<XalanDOMString,
- MutableNodeRefList>
NodeListMapType;
+ MutableNodeRefList,
+ less<XalanDOMString> > NodeListMapType;
typedef map<XalanDOMString,
- NodeListMapType>
KeysMapType;
+ NodeListMapType,
+ less<XalanDOMString> > KeysMapType;
#else
typedef std::map<XalanDOMString,
MutableNodeRefList> NodeListMapType;
1.13 +6 -6 xml-xalan/c/src/XSLT/NodeSorter.cpp
Index: NodeSorter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSorter.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NodeSorter.cpp 2000/07/25 14:51:32 1.12
+++ NodeSorter.cpp 2000/08/07 19:52:04 1.13
@@ -292,12 +292,12 @@
if (i != m_numberResultsCache.end())
{
const NumberResultsNodeCacheMapType::const_iterator j =
- i->second.find(node);
+ (*i).second.find(node);
- if (j != i->second.end())
+ if (j != (*i).second.end())
{
// Yuck!!!! Big ugly return here!!!
- return j->second;
+ return (*j).second;
}
}
@@ -332,12 +332,12 @@
if (i != m_stringResultsCache.end())
{
const StringResultsNodeCacheMapType::const_iterator j =
- i->second.find(node);
+ (*i).second.find(node);
- if (j != i->second.end())
+ if (j != (*i).second.end())
{
// Yuck!!!! Big ugly return here!!!
- return j->second;
+ return (*j).second;
}
}
1.9 +14 -4 xml-xalan/c/src/XSLT/NodeSorter.hpp
Index: NodeSorter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSorter.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NodeSorter.hpp 2000/07/25 14:51:33 1.8
+++ NodeSorter.hpp 2000/08/07 19:52:05 1.9
@@ -199,11 +199,21 @@
const NodeSortKeyVectorType& m_nodeSortKeys;
#if defined(XALAN_NO_NAMESPACES)
- typedef map<const XalanNode*, double>
NumberResultsNodeCacheMapType;
- typedef map<const XalanNode*, XalanDOMString>
StringResultsNodeCacheMapType;
+ typedef map<const XalanNode*,
+ double,
+ less<const XalanNode*> >
NumberResultsNodeCacheMapType;
- typedef map<const XPath*, NumberResultsNodeCacheMapType>
NumberResultsCacheMapType;
- typedef map<const XPath*, StringResultsNodeCacheMapType>
StringResultsCacheMapType;
+ typedef map<const XalanNode*,
+ XalanDOMString,
+ less<const XalanNode*> >
StringResultsNodeCacheMapType;
+
+ typedef map<const XPath*,
+ NumberResultsNodeCacheMapType,
+ less<const XPath*> >
NumberResultsCacheMapType;
+
+ typedef map<const XPath*,
+ StringResultsNodeCacheMapType,
+ less<const XPath*> >
StringResultsCacheMapType;
#else
typedef std::map<const XalanNode*, double>
NumberResultsNodeCacheMapType;
typedef std::map<const XalanNode*, XalanDOMString>
StringResultsNodeCacheMapType;
1.28 +4 -4 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Stylesheet.cpp 2000/08/03 15:27:44 1.27
+++ Stylesheet.cpp 2000/08/07 19:52:05 1.28
@@ -204,7 +204,7 @@
it != m_patternTable.end();
++it)
{
- const PatternTableListType& theList = it->second;
+ const PatternTableListType& theList = (*it).second;
for_each(theList.begin(),
theList.end(),
@@ -990,7 +990,7 @@
if (i != theKeysTable.end())
{
- nl = i->second->getNodeSetByKey(name, ref);
+ nl = (*i).second->getNodeSetByKey(name, ref);
if (nl->getLength() > 0)
{
@@ -1245,7 +1245,7 @@
if (i != m_prefixAliases.end())
{
// $$$ ToDo: This could also be an error?
- i->second = resultNamespace;
+ (*i).second = resultNamespace;
}
else
{
@@ -1271,7 +1271,7 @@
if (i != m_prefixAliases.end())
{
- result = i->second;
+ result = (*i).second;
assert(length(result) > 0);
}
1.19 +13 -6 xml-xalan/c/src/XSLT/Stylesheet.hpp
Index: Stylesheet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Stylesheet.hpp 2000/07/25 14:52:12 1.18
+++ Stylesheet.hpp 2000/08/07 19:52:06 1.19
@@ -808,13 +808,20 @@
};
#if defined(XALAN_NO_NAMESPACES)
- typedef list<MatchPattern2*>
PatternTableListType;
- typedef vector<const MatchPattern2*> PatternTableVectorType;
- typedef map<XalanDOMString, PatternTableListType> PatternTableMapType;
+ typedef list<MatchPattern2*>
PatternTableListType;
+
+ typedef vector<const MatchPattern2*> PatternTableVectorType;
+
+ typedef map<XalanDOMString,
+ PatternTableListType,
+ less<XalanDOMString> >
PatternTableMapType;
#else
- typedef std::list<MatchPattern2*>
PatternTableListType;
- typedef std::vector<const MatchPattern2*>
PatternTableVectorType;
- typedef std::map<XalanDOMString, PatternTableListType>
PatternTableMapType;
+ typedef std::list<MatchPattern2*>
PatternTableListType;
+
+ typedef std::vector<const MatchPattern2*> PatternTableVectorType;
+
+ typedef std::map<XalanDOMString,
+ PatternTableListType>
PatternTableMapType;
#endif
/**
1.25 +5 -5
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StylesheetExecutionContextDefault.cpp 2000/07/28 22:02:21 1.24
+++ StylesheetExecutionContextDefault.cpp 2000/08/07 19:52:06 1.25
@@ -482,9 +482,9 @@
if (i != m_matchPatternCache.end())
{
// Update hit time...
- i->second.second = clock();
+ (*i).second.second = clock();
- theResult = i->second.first;
+ theResult = (*i).second.first;
}
else
{
@@ -1864,7 +1864,7 @@
while(i != theEnd)
{
- if (i->second.first == theXPath)
+ if ((*i).second.first == theXPath)
{
return true;
}
@@ -1974,7 +1974,7 @@
while(i != theEnd)
{
- const clock_t current = i->second.second;
+ const clock_t current = (*i).second.second;
if (current < lowest)
{
@@ -1992,7 +1992,7 @@
assert(earliest != theEnd);
// Return the XPath and erase it from the cache.
- m_xsltProcessor.returnXPath(earliest->second.first);
+ m_xsltProcessor.returnXPath((*earliest).second.first);
m_matchPatternCache.erase(earliest);
}
1.23 +3 -1
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- StylesheetExecutionContextDefault.hpp 2000/07/28 22:02:21 1.22
+++ StylesheetExecutionContextDefault.hpp 2000/08/07 19:52:06 1.23
@@ -780,7 +780,9 @@
typedef vector<const XObject*>
VariablesCollectionType;
typedef vector<VariablesCollectionType>
LiveVariablesStackType;
typedef pair<XPath*, clock_t>
XPathCacheEntry;
- typedef map<XalanDOMString, XPathCacheEntry>
XPathCacheMapType;
+ typedef map<XalanDOMString,
+ XPathCacheEntry,
+ less<XalanDOMString> >
XPathCacheMapType;
#else
typedef std::deque<const ElemTemplateElement*>
ElementRecursionStackType;
typedef std::set<FormatterListener*>
FormatterListenerSetType;
1.15 +2 -2 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp
Index: XSLTProcessorEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSLTProcessorEnvSupportDefault.cpp 2000/07/21 19:52:58 1.14
+++ XSLTProcessorEnvSupportDefault.cpp 2000/08/07 19:52:06 1.15
@@ -183,7 +183,7 @@
}
else
{
- return i->second;
+ return (*i).second;
}
}
@@ -388,7 +388,7 @@
}
else
{
- return i->second;
+ return (*i).second;
}
}
1.12 +3 -1 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp
Index: XSLTProcessorEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSLTProcessorEnvSupportDefault.hpp 2000/07/21 19:52:58 1.11
+++ XSLTProcessorEnvSupportDefault.hpp 2000/08/07 19:52:07 1.12
@@ -264,7 +264,9 @@
operator==(const XSLTProcessorEnvSupportDefault&) const;
#if defined(XALAN_NO_NAMESPACES)
- typedef map<const XalanNode*, XLocator*>
XLocatorTableType;
+ typedef map<const XalanNode*,
+ XLocator*,
+ less<const XalanNode*> >
XLocatorTableType;
#else
typedef std::map<const XalanNode*, XLocator*> XLocatorTableType;
#endif
