mhoyt 2004/11/12 11:56:18
Modified: c/src/xalanc/DOMSupport XalanDocumentPrefixResolver.cpp
XalanDocumentPrefixResolver.hpp
c/src/xalanc/PlatformSupport DOMStringHelper.hpp
Log:
Fix to enable prefix resolver to operator correctly with maps
Revision Changes Path
1.6 +7 -9
xml-xalan/c/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp
Index: XalanDocumentPrefixResolver.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanDocumentPrefixResolver.cpp 8 Nov 2004 18:04:45 -0000 1.5
+++ XalanDocumentPrefixResolver.cpp 12 Nov 2004 19:56:18 -0000 1.6
@@ -65,21 +65,19 @@
}
else
{
- const AttributeVectorType* theVector = (*i).second;
+ const AttributeVectorType& theVector = (*i).second;
- assert( theVector != 0);
+ assert(theVector.empty() == false);
- assert(theVector->empty() == false);
-
- if (theVector->size() == 1)
+ if (theVector.size() == 1)
{
- assert(theVector->front() != 0);
+ assert(theVector.front() != 0);
- return &(theVector->front()->getNodeValue());
+ return &(theVector.front()->getNodeValue());
}
else
{
- return duplicateBinding(*theVector);
+ return duplicateBinding(theVector);
}
}
}
@@ -152,7 +150,7 @@
if
(DOMServices::isNamespaceDeclaration(*theAttr) == true)
{
-
m_map[&theAttr->getLocalName()]->push_back(theAttr);
+
m_map[&theAttr->getLocalName()].push_back(theAttr);
}
}
}
1.9 +1 -1
xml-xalan/c/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.hpp
Index: XalanDocumentPrefixResolver.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanDocumentPrefixResolver.hpp 10 Nov 2004 17:56:07 -0000 1.8
+++ XalanDocumentPrefixResolver.hpp 12 Nov 2004 19:56:18 -0000 1.9
@@ -59,7 +59,7 @@
typedef XalanVector<const XalanNode*>
AttributeVectorType;
typedef XalanMap<const XalanDOMString*,
- AttributeVectorType*>
NamespacesMapType;
+ AttributeVectorType>
NamespacesMapType;
/**
* Constructor.
1.12 +6 -0
xml-xalan/c/src/xalanc/PlatformSupport/DOMStringHelper.hpp
Index: DOMStringHelper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/DOMStringHelper.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMStringHelper.hpp 10 Nov 2004 19:09:11 -0000 1.11
+++ DOMStringHelper.hpp 12 Nov 2004 19:56:18 -0000 1.12
@@ -2372,6 +2372,12 @@
typedef pointer_equal<XalanDOMString> Comparator;
};
+template<>
+struct XalanMapKeyTraits<const XalanDOMString*>
+{
+ typedef DOMStringPointerHashFunction Hasher;
+ typedef pointer_equal<XalanDOMString> Comparator;
+};
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
