dbertoni 00/08/07 12:51:13
Modified: c/src/PlatformSupport AttributeListImpl.cpp
AttributeListImpl.hpp STLHelper.hpp
Log:
Fixes for AIX compiler issues.
Revision Changes Path
1.10 +4 -4 xml-xalan/c/src/PlatformSupport/AttributeListImpl.cpp
Index: AttributeListImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributeListImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AttributeListImpl.cpp 2000/07/02 02:41:42 1.9
+++ AttributeListImpl.cpp 2000/08/07 19:51:08 1.10
@@ -309,7 +309,7 @@
if (i != m_AttributeKeyMap.end())
{
// Found it, so return a pointer to the type.
- return i->second->m_Type.begin();
+ return (*i).second->m_Type.begin();
}
else
{
@@ -341,7 +341,7 @@
if (i != m_AttributeKeyMap.end())
{
// Found it, so return a pointer to the value.
- return i->second->m_Value.begin();
+ return (*i).second->m_Value.begin();
}
else
{
@@ -411,8 +411,8 @@
XMLChVectorType theNewType(type, endArray(type) + 1);
XMLChVectorType theNewValue(value, endArray(value) + 1);
- theNewType.swap(i->second->m_Type);
- theNewValue.swap(i->second->m_Value);
+ theNewType.swap((*i).second->m_Type);
+ theNewValue.swap((*i).second->m_Value);
}
else
{
1.8 +8 -6 xml-xalan/c/src/PlatformSupport/AttributeListImpl.hpp
Index: AttributeListImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributeListImpl.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AttributeListImpl.hpp 2000/07/02 02:41:43 1.7
+++ AttributeListImpl.hpp 2000/08/07 19:51:08 1.8
@@ -154,12 +154,6 @@
bool
operator==(const AttributeListImpl&) const;
-#if defined(XALAN_NO_NAMESPACES)
- typedef vector<XMLCh> XMLChVectorType;
-#else
- typedef std::vector<XMLCh> XMLChVectorType;
-#endif
-
// Default vector allocation size.
enum
{
@@ -169,6 +163,12 @@
// A struct to hold information about each attribute.
struct AttributeVectorEntry
{
+#if defined(XALAN_NO_NAMESPACES)
+ typedef vector<XMLCh> XMLChVectorType;
+#else
+ typedef std::vector<XMLCh> XMLChVectorType;
+#endif
+
AttributeVectorEntry(const XMLChVectorType& theName =
XMLChVectorType(),
const XMLChVectorType&
theValue = XMLChVectorType(),
const XMLChVectorType&
theType = XMLChVectorType()) :
@@ -182,6 +182,8 @@
XMLChVectorType m_Value;
XMLChVectorType m_Type;
};
+
+ typedef AttributeVectorEntry::XMLChVectorType XMLChVectorType;
#if defined(XALAN_NO_NAMESPACES)
// This vector will hold the entries.
1.9 +4 -0 xml-xalan/c/src/PlatformSupport/STLHelper.hpp
Index: STLHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/STLHelper.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- STLHelper.hpp 2000/06/27 16:28:12 1.8
+++ STLHelper.hpp 2000/08/07 19:51:08 1.9
@@ -85,7 +85,11 @@
result_type
operator()(argument_type thePointer) const
{
+#if defined(XALAN_REALY_STUPID_COMPILER)
+ delete (T*)thePointer;
+#else
delete thePointer;
+#endif
}
};
