dbertoni 01/03/01 11:01:16
Modified: c/src/XPath XObjectFactoryDefault.cpp
XObjectFactoryDefault.hpp
Log:
Use vector instead of set for holding instances.
Revision Changes Path
1.22 +8 -4 xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp
Index: XObjectFactoryDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XObjectFactoryDefault.cpp 2001/02/27 16:49:41 1.21
+++ XObjectFactoryDefault.cpp 2001/03/01 19:01:14 1.22
@@ -269,9 +269,13 @@
default:
{
- const CollectionType::iterator i =
- m_xobjects.find(theXObject);
+#if !defined(XALAN_NO_NAMESPACES)
+ using std::find;
+#endif
+ const XObjectCollectionType::iterator i =
+ find(m_xobjects.begin(),
m_xobjects.end(), theXObject);
+
if (i != m_xobjects.end())
{
if (fInReset == false)
@@ -321,7 +325,7 @@
{
XUnknown* const theXUnknown = new XUnknown(theValue);
- m_xobjects.insert(theXUnknown);
+ m_xobjects.push_back(theXUnknown);
theXUnknown->setFactory(this);
@@ -335,7 +339,7 @@
{
XSpan* const theXObject = new XSpan(theValue);
- m_xobjects.insert(theXObject);
+ m_xobjects.push_back(theXObject);
theXObject->setFactory(this);
1.21 +7 -7 xml-xalan/c/src/XPath/XObjectFactoryDefault.hpp
Index: XObjectFactoryDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XObjectFactoryDefault.hpp 2001/02/27 16:49:41 1.20
+++ XObjectFactoryDefault.hpp 2001/03/01 19:01:15 1.21
@@ -192,13 +192,13 @@
createSpan(BorrowReturnMutableNodeRefList& theValue);
#if defined(XALAN_NO_NAMESPACES)
- typedef set<XObject*, less<XObject*> > CollectionType;
- typedef vector<XNumber*>
XNumberCacheType;
- typedef vector<XNodeSet*>
XNodeSetCacheType;
+ typedef vector<XObject*> XObjectCollectionType;
+ typedef vector<XNumber*> XNumberCacheType;
+ typedef vector<XNodeSet*> XNodeSetCacheType;
#else
- typedef std::set<XObject*> CollectionType;
- typedef std::vector<XNumber*> XNumberCacheType;
- typedef std::vector<XNodeSet*> XNodeSetCacheType;
+ typedef std::vector<XObject*> XObjectCollectionType;
+ typedef std::vector<XNumber*> XNumberCacheType;
+ typedef std::vector<XNodeSet*> XNodeSetCacheType;
#endif
protected:
@@ -242,7 +242,7 @@
XTokenStringAdapterAllocator m_xtokenStringAdapterAllocator;
- CollectionType m_xobjects;
+ XObjectCollectionType m_xobjects;
XNumberCacheType m_xnumberCache;
