dbertoni 00/08/07 12:51:53
Modified: c/src/XPath XPathEnvSupportDefault.cpp
XPathEnvSupportDefault.hpp XPathFunctionTable.cpp
XPathFunctionTable.hpp XPathProcessorImpl.cpp
Log:
Fixes for AIX compiler issues.
Revision Changes Path
1.14 +15 -15 xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp
Index: XPathEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XPathEnvSupportDefault.cpp 2000/07/21 19:50:03 1.13
+++ XPathEnvSupportDefault.cpp 2000/08/07 19:51:48 1.14
@@ -131,33 +131,33 @@
// There is already a table for the namespace,
// so look for the function...
const FunctionTableType::iterator j =
- i->second.find(functionName);
+ (*i).second.find(functionName);
- if (j == i->second.end())
+ if (j == (*i).second.end())
{
// The function was not found. If function is not
// 0, then add a clone of the function.
if (function != 0)
{
- i->second[functionName] = function->clone();
+ (*i).second[functionName] = function->clone();
}
}
else
{
// Found it, so delete the function...
- delete j->second;
+ delete (*j).second;
// If function is not 0, then we update
// the entry. Otherwise, we erase it...
if (function != 0)
{
// Update it...
- j->second = function->clone();
+ (*j).second = function->clone();
}
else
{
// Erase it...
- i->second.erase(j);
+ (*i).second.erase(j);
}
}
}
@@ -250,7 +250,7 @@
}
else
{
- return i->second;
+ return (*i).second;
}
}
@@ -276,7 +276,7 @@
while(i != m_sourceDocs.end() && fFound == false)
{
- if (i->second == owner)
+ if ((*i).second == owner)
{
fFound = true;
}
@@ -286,7 +286,7 @@
}
}
- return fFound == false ? XalanDOMString() : i->first;
+ return fFound == false ? XalanDOMString() : (*i).first;
}
@@ -333,9 +333,9 @@
// There is a table for the namespace,
// so look for the function...
const FunctionTableType::const_iterator j =
- i->second.find(functionName);
+ (*i).second.find(functionName);
- if (j != i->second.end())
+ if (j != (*i).second.end())
{
theResult = true;
}
@@ -389,14 +389,14 @@
// There is a table for the namespace,
// so look for the function...
const FunctionTableType::const_iterator j =
- i->second.find(functionName);
+ (*i).second.find(functionName);
- if (j != i->second.end())
+ if (j != (*i).second.end())
{
// Found the function...
- assert(j->second != 0);
+ assert((*j).second != 0);
- theFunction = j->second;
+ theFunction = (*j).second;
}
}
1.12 +3 -3 xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XPathEnvSupportDefault.hpp 2000/07/21 19:50:03 1.11
+++ XPathEnvSupportDefault.hpp 2000/08/07 19:51:48 1.12
@@ -254,9 +254,9 @@
operator==(const XPathEnvSupportDefault&) const;
#if defined(XALAN_NO_NAMESPACES)
- typedef map<XalanDOMString, XalanDocument*>
SourceDocsTableType;
- typedef map<XalanDOMString, Function*>
FunctionTableType;
- typedef map<XalanDOMString, FunctionTableType>
NamespaceFunctionTablesType;
+ typedef map<XalanDOMString, XalanDocument*, less<XalanDOMString> >
SourceDocsTableType;
+ typedef map<XalanDOMString, Function*, less<XalanDOMString> >
FunctionTableType;
+ typedef map<XalanDOMString, FunctionTableType, less<XalanDOMString> >
NamespaceFunctionTablesType;
#else
typedef std::map<XalanDOMString, XalanDocument*>
SourceDocsTableType;
typedef std::map<XalanDOMString, Function*>
FunctionTableType;
1.9 +6 -6 xml-xalan/c/src/XPath/XPathFunctionTable.cpp
Index: XPathFunctionTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathFunctionTable.cpp 2000/08/04 21:30:46 1.8
+++ XPathFunctionTable.cpp 2000/08/07 19:51:48 1.9
@@ -121,12 +121,12 @@
if (i != m_FunctionNameIndex.end())
{
- assert(CollectionType::size_type(i->second) <
m_FunctionCollection.size());
+ assert(CollectionType::size_type((*i).second) <
m_FunctionCollection.size());
// It is, so delete the old one, and add the new one...
- delete m_FunctionCollection[i->second];
+ delete m_FunctionCollection[(*i).second];
- m_FunctionCollection[i->second] = theFunction.clone();
+ m_FunctionCollection[(*i).second] = theFunction.clone();
}
else
{
@@ -155,17 +155,17 @@
}
else
{
- assert(CollectionType::size_type(i->second) <
m_FunctionCollection.size());
+ assert(CollectionType::size_type((*i).second) <
m_FunctionCollection.size());
#if !defined(XALAN_NO_NAMESPACES)
using std::find;
#endif
// Delete the function...
- delete m_FunctionCollection[i->second];
+ delete m_FunctionCollection[(*i).second];
// Erase it from the table...
- m_FunctionCollection.erase(&m_FunctionCollection[i->second]);
+ m_FunctionCollection.erase(&m_FunctionCollection[(*i).second]);
return true;
}
1.8 +7 -5 xml-xalan/c/src/XPath/XPathFunctionTable.hpp
Index: XPathFunctionTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPathFunctionTable.hpp 2000/08/04 21:30:46 1.7
+++ XPathFunctionTable.hpp 2000/08/07 19:51:49 1.8
@@ -111,7 +111,9 @@
#if defined(XALAN_NO_NAMESPACES)
typedef vector<Function*> CollectionType;
- typedef map<XalanDOMString, int>
FunctionNameIndexMapType;
+ typedef map<XalanDOMString,
+ int,
+ less<XalanDOMString> >
FunctionNameIndexMapType;
#else
typedef std::vector<Function*> CollectionType;
typedef std::map<XalanDOMString, int> FunctionNameIndexMapType;
@@ -137,7 +139,7 @@
if (i != m_FunctionNameIndex.end())
{
- return *m_FunctionCollection[i->second];
+ return *m_FunctionCollection[(*i).second];
}
else
{
@@ -186,9 +188,9 @@
while (i != m_FunctionNameIndex.end())
{
- if (i->second == theFunctionID)
+ if ((*i).second == theFunctionID)
{
- theName = i->first;
+ theName = (*i).first;
break;
}
@@ -212,7 +214,7 @@
if (i != m_FunctionNameIndex.end())
{
- return i->second;
+ return (*i).second;
}
else
{
1.18 +2 -2 xml-xalan/c/src/XPath/XPathProcessorImpl.cpp
Index: XPathProcessorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XPathProcessorImpl.cpp 2000/08/04 21:30:47 1.17
+++ XPathProcessorImpl.cpp 2000/08/07 19:51:50 1.18
@@ -1928,10 +1928,10 @@
}
else
{
- m_expression->appendOpCode(i->second);
+ m_expression->appendOpCode((*i).second);
}
- return i->second;
+ return (*i).second;
}
