You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mh...@apache.org on 2004/08/31 16:20:28 UTC
cvs commit: xml-xalan/c/src/xalanc/XercesParserLiaison/Deprecated XercesElementBridge.hpp
mhoyt 2004/08/31 07:20:28
Modified: c/Projects/Win32/VC7.1/AllInOne AllInOne.vcproj
AllInOneWithICU.vcproj
c/src/xalanc/DOMSupport XalanDocumentPrefixResolver.hpp
c/src/xalanc/Include STLHelper.hpp
c/src/xalanc/PlatformSupport DOMStringHelper.hpp
c/src/xalanc/XPath XPathEnvSupportDefault.hpp
XPathProcessorImpl.hpp XalanQName.hpp
c/src/xalanc/XSLT KeyTable.hpp NamespacesHandler.hpp
Stylesheet.hpp
StylesheetExecutionContextDefault.hpp
StylesheetRoot.cpp StylesheetRoot.hpp
XSLTEngineImpl.hpp
c/src/xalanc/XalanExe XalanExe.cpp
c/src/xalanc/XalanSourceTree XalanSourceTreeDocument.hpp
XalanSourceTreeParserLiaison.hpp
c/src/xalanc/XercesParserLiaison XercesParserLiaison.hpp
XercesWrapperToXalanNodeMap.hpp
c/src/xalanc/XercesParserLiaison/Deprecated
XercesElementBridge.hpp
Log:
Initial XalanMap integration (replacing std::map)
Revision Changes Path
1.4 +3 -0 xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
Index: AllInOne.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AllInOne.vcproj 12 Aug 2004 21:38:28 -0000 1.3
+++ AllInOne.vcproj 31 Aug 2004 14:20:26 -0000 1.4
@@ -260,6 +260,9 @@
RelativePath="..\..\..\..\src\xalanc\Include\XalanAutoPtr.hpp">
</File>
<File
+ RelativePath="..\..\..\..\src\xalanc\Include\XalanMap.hpp">
+ </File>
+ <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp">
</File>
<File
1.4 +3 -0 xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
Index: AllInOneWithICU.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AllInOneWithICU.vcproj 12 Aug 2004 21:38:28 -0000 1.3
+++ AllInOneWithICU.vcproj 31 Aug 2004 14:20:26 -0000 1.4
@@ -254,6 +254,9 @@
RelativePath="..\..\..\..\src\xalanc\Include\XalanAutoPtr.hpp">
</File>
<File
+ RelativePath="..\..\..\..\src\xalanc\Include\XalanMap.hpp">
+ </File>
+ <File
RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp">
</File>
<File
1.5 +5 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanDocumentPrefixResolver.hpp 31 Jul 2004 06:05:02 -0000 1.4
+++ XalanDocumentPrefixResolver.hpp 31 Aug 2004 14:20:26 -0000 1.5
@@ -23,10 +23,6 @@
-#include <map>
-
-
-
#include <xalanc/XalanDOM/XalanDOMString.hpp>
@@ -35,7 +31,9 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/Include/XalanMap.hpp>
#include <xalanc/Include/STLHelper.hpp>
@@ -60,9 +58,10 @@
public:
typedef XalanVector<const XalanNode*> AttributeVectorType;
- typedef XALAN_STD_QUALIFIER map<const XalanDOMString*,
+ typedef XalanMap<const XalanDOMString*,
AttributeVectorType,
- pointer_less<XalanDOMString> > NamespacesMapType;
+ DOMStringPointerHashFunction,
+ pointer_equal<XalanDOMString> > NamespacesMapType;
/**
* Constructor.
1.5 +82 -0 xml-xalan/c/src/xalanc/Include/STLHelper.hpp
Index: STLHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/STLHelper.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- STLHelper.hpp 26 Feb 2004 22:30:58 -0000 1.4
+++ STLHelper.hpp 31 Aug 2004 14:20:26 -0000 1.5
@@ -284,6 +284,67 @@
+template<class T>
+struct equal_null_terminated_arrays : public XALAN_STD_QUALIFIER binary_function<const T*, const T*, bool>
+{
+ /**
+ * Compare the values of two objects.
+ *
+ *
+ * @param theLHS first object to compare
+ * @param theRHS second object to compare
+ * @return true if objects are the same
+ */
+ result_type
+ operator()(
+ first_argument_type theLHS,
+ second_argument_type theRHS) const
+ {
+ while(*theLHS && *theRHS)
+ {
+ if (*theLHS != *theRHS)
+ {
+ return false;
+ }
+ else
+ {
+ ++theLHS;
+ ++theRHS;
+ }
+ }
+
+ if (*theLHS || *theRHS)
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+};
+
+template <class T>
+struct hash_null_terminated_arrays : public XALAN_STD_QUALIFIER unary_function<const T*, size_t>
+{
+ result_type
+ operator() (argument_type theKey) const
+ {
+ const T* theRawBuffer = theKey;
+
+ result_type theHashValue = 0;
+
+ while (*theRawBuffer)
+ {
+ theHashValue = 5 * theHashValue + *theRawBuffer;
+ ++theRawBuffer;
+ }
+
+ return ++theHashValue;
+ }
+};
+
+
template<class CollectionType>
class CollectionClearGuard
{
@@ -465,6 +526,27 @@
return less<T>()(*theLHS, *theRHS);
}
};
+
+
+template<class T>
+struct pointer_equal : public XALAN_STD_QUALIFIER binary_function<const T*, const T*, bool>
+{
+ typedef XALAN_STD_QUALIFIER binary_function<const T*, const T*, bool> BaseClassType;
+
+ typedef typename BaseClassType::result_type result_type;
+ typedef typename BaseClassType::first_argument_type first_argument_type;
+ typedef typename BaseClassType::second_argument_type second_argument_type;
+
+ result_type
+ operator()(
+ first_argument_type theLHS,
+ second_argument_type theRHS) const
+ {
+ assert(theLHS != 0 && theRHS != 0);
+ return XALAN_STD_QUALIFIER equal_to<T>()(*theLHS, *theRHS);
+ }
+};
+
1.7 +35 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOMStringHelper.hpp 31 Jul 2004 06:05:04 -0000 1.6
+++ DOMStringHelper.hpp 31 Aug 2004 14:20:26 -0000 1.7
@@ -2571,6 +2571,22 @@
}
};
+/**
+ * Hash functor for DOMStrings
+ *
+ * @param theKey XalanDOMString to be hashed
+ * @return hash value for XalanDOMString
+ */
+struct DOMStringPointerHashFunction : public XALAN_STD_QUALIFIER unary_function<const XalanDOMString*, size_t>
+{
+ result_type
+ operator() (argument_type theKey) const
+ {
+ assert (theKey != 0);
+ return DOMStringHashFunction()(*theKey);
+ }
+};
+
/**
@@ -2640,6 +2656,25 @@
}
};
+
+/**
+ * Equal to functor for DOMStrings
+ *
+ * @param theLHS first string to compare
+ * @param theRHS second string to compare
+ * @return true if the theLHS is equal to theRHS
+ */
+struct DOMStringPointerEqualToFunction : public XALAN_STD_QUALIFIER binary_function<const XalanDOMString*, const XalanDOMString*, bool>
+{
+ result_type
+ operator() (first_argument_type theLHS,
+ second_argument_type theRHS) const
+ {
+ assert(theLHS != 0 && theRHS != 0);
+
+ return compare(*theLHS, *theRHS) == 0 ? true : false;
+ }
+};
/**
1.6 +6 -11 xml-xalan/c/src/xalanc/XPath/XPathEnvSupportDefault.hpp
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathEnvSupportDefault.hpp 31 Jul 2004 06:05:07 -0000 1.5
+++ XPathEnvSupportDefault.hpp 31 Aug 2004 14:20:27 -0000 1.6
@@ -20,14 +20,15 @@
// Base include file. Must be first.
#include <xalanc/XPath/XPathDefinitions.hpp>
+#include <xalanc/XPath/XPathEnvSupport.hpp>
-#include<map>
+#include<xalanc/Include/XalanMap.hpp>
-#include <xalanc/XPath/XPathEnvSupport.hpp>
+#include<xalanc/PlatformSupport/DOMStringHelper.hpp>
@@ -44,15 +45,9 @@
{
public:
-#if defined(XALAN_NO_STD_NAMESPACE)
- typedef map<XalanDOMString, XalanDocument*, less<XalanDOMString> > SourceDocsTableType;
- typedef map<XalanDOMString, const Function*, less<XalanDOMString> > FunctionTableType;
- typedef map<XalanDOMString, FunctionTableType, less<XalanDOMString> > NamespaceFunctionTablesType;
-#else
- typedef std::map<XalanDOMString, XalanDocument*> SourceDocsTableType;
- typedef std::map<XalanDOMString, const Function*> FunctionTableType;
- typedef std::map<XalanDOMString, FunctionTableType> NamespaceFunctionTablesType;
-#endif
+ typedef XalanMap<XalanDOMString, XalanDocument*, DOMStringHashFunction> SourceDocsTableType;
+ typedef XalanMap<XalanDOMString, const Function*, DOMStringHashFunction> FunctionTableType;
+ typedef XalanMap<XalanDOMString, FunctionTableType, DOMStringHashFunction> NamespaceFunctionTablesType;
/**
* Perform initialization of statics -- must be called before any
1.7 +4 -3 xml-xalan/c/src/xalanc/XPath/XPathProcessorImpl.hpp
Index: XPathProcessorImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathProcessorImpl.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathProcessorImpl.hpp 13 Aug 2004 15:49:07 -0000 1.6
+++ XPathProcessorImpl.hpp 31 Aug 2004 14:20:27 -0000 1.7
@@ -24,11 +24,12 @@
#include <cstdlib>
-#include <map>
+
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/Include/XalanMap.hpp>
@@ -61,9 +62,9 @@
{
public:
- typedef XALAN_STD_QUALIFIER map<XalanDOMString,
+ typedef XalanMap<XalanDOMString,
const XalanDOMString*,
- XALAN_STD_QUALIFIER less<XalanDOMString> > StringToStringMapType;
+ DOMStringHashFunction> StringToStringMapType;
typedef XalanVector<bool> BoolVectorType;
1.6 +1 -1 xml-xalan/c/src/xalanc/XPath/XalanQName.hpp
Index: XalanQName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanQName.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanQName.hpp 24 Aug 2004 14:03:15 -0000 1.5
+++ XalanQName.hpp 31 Aug 2004 14:20:27 -0000 1.6
@@ -145,7 +145,7 @@
XalanDOMString::size_type
hash() const
{
- return getLocalPart().hash() % getNamespace().hash();
+ return getLocalPart().hash() % (getNamespace().hash() + 1);
}
class XALAN_XPATH_EXPORT PrefixResolverProxy : public PrefixResolver
1.6 +16 -22 xml-xalan/c/src/xalanc/XSLT/KeyTable.hpp
Index: KeyTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/KeyTable.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KeyTable.hpp 31 Jul 2004 06:05:08 -0000 1.5
+++ KeyTable.hpp 31 Aug 2004 14:20:27 -0000 1.6
@@ -30,15 +30,8 @@
-#if defined(XALAN_USE_HASH_MAP)
-#include <hash_map>
-#else
-#include <map>
-#endif
-
-
-
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/Include/XalanMap.hpp>
@@ -78,20 +71,21 @@
typedef XalanVector<KeyDeclaration> KeyDeclarationVectorType;
-#if defined(XALAN_USE_HASH_MAP)
- typedef std::hash_map<XalanDOMString,
- MutableNodeRefList> NodeListMapType;
-
- typedef std::hash_map<XalanQNameByReference,
- NodeListMapType> KeysMapType;
-#else
- typedef XALAN_STD_QUALIFIER map<XalanDOMString,
- MutableNodeRefList> NodeListMapType;
-
- typedef XALAN_STD_QUALIFIER map<XalanQNameByReference,
- NodeListMapType> KeysMapType;
-#endif
+ typedef XalanMap<XalanDOMString,
+ MutableNodeRefList,
+ DOMStringHashFunction> NodeListMapType;
+
+
+
+ typedef XalanMap<XalanQNameByReference,
+ NodeListMapType,
+ XalanHashMemberReference<XalanQNameByReference> > KeysMapType;
+
+
+ /*typedef std::map<XalanQNameByReference,
+ NodeListMapType
+ > KeysMapType;*/
/**
* Build a keys table.
1.8 +5 -3 xml-xalan/c/src/xalanc/XSLT/NamespacesHandler.hpp
Index: NamespacesHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/NamespacesHandler.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NamespacesHandler.hpp 9 Aug 2004 21:09:54 -0000 1.7
+++ NamespacesHandler.hpp 31 Aug 2004 14:20:27 -0000 1.8
@@ -24,12 +24,12 @@
-#include <map>
#include <set>
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/Include/XalanMap.hpp>
@@ -199,9 +199,11 @@
typedef XalanVector<NamespaceExtended> NamespaceExtendedVectorType;
typedef XalanVector<const XalanDOMString*> XalanDOMStringPointerVectorType;
- typedef XALAN_STD_QUALIFIER map<const XalanDOMString*,
+ typedef XalanMap<const XalanDOMString*,
const XalanDOMString*,
- DOMStringPointerLessThanFunction> NamespaceAliasesMapType;
+ DOMStringPointerHashFunction,
+ DOMStringPointerEqualToFunction> NamespaceAliasesMapType;
+
/**
* Create a default, empty instance.
1.12 +10 -10 xml-xalan/c/src/xalanc/XSLT/Stylesheet.hpp
Index: Stylesheet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/Stylesheet.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Stylesheet.hpp 3 Aug 2004 16:49:52 -0000 1.11
+++ Stylesheet.hpp 31 Aug 2004 14:20:27 -0000 1.12
@@ -24,11 +24,12 @@
-#include <map>
+
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/Include/XalanMap.hpp>
@@ -98,21 +99,20 @@
typedef XalanVector<XalanSpaceNodeTester> WhitespaceElementsVectorType;
typedef XalanVector<const XalanMatchPatternData*> PatternTableVectorType;
- typedef XALAN_STD_QUALIFIER map<XalanDOMString,
+ typedef XalanMap<XalanDOMString,
ExtensionNSHandler*,
- XALAN_STD_QUALIFIER less<XalanDOMString> > ExtensionNamespacesMapType;
+ DOMStringHashFunction> ExtensionNamespacesMapType;
- typedef XALAN_STD_QUALIFIER map<XalanQNameByReference,
+ typedef XalanMap<XalanQNameByReference,
const ElemTemplate*,
- XALAN_STD_QUALIFIER less<XalanQName> > ElemTemplateMapType;
+ XalanHashMemberReference<XalanQNameByReference> > ElemTemplateMapType;
- typedef XALAN_STD_QUALIFIER map<const XalanNode*,
- KeyTable*,
- XALAN_STD_QUALIFIER less<const XalanNode*> > KeyTablesTableType;
+ typedef XalanMap<const XalanNode*,
+ KeyTable* > KeyTablesTableType;
- typedef XALAN_STD_QUALIFIER map<XalanDOMString,
+ typedef XalanMap<XalanDOMString,
PatternTableVectorType,
- XALAN_STD_QUALIFIER less<XalanDOMString> > PatternTableMapType;
+ DOMStringHashFunction> PatternTableMapType;
/**
* Constructor for a Stylesheet needs a Document.
1.28 +4 -3 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StylesheetExecutionContextDefault.hpp 13 Aug 2004 15:49:47 -0000 1.27
+++ StylesheetExecutionContextDefault.hpp 31 Aug 2004 14:20:27 -0000 1.28
@@ -31,6 +31,7 @@
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/Include/XalanMap.hpp>
#include <xalanc/Include/XalanObjectCache.hpp>
#include <xalanc/Include/XalanObjectStackCache.hpp>
@@ -93,9 +94,9 @@
typedef XALAN_STD_QUALIFIER set<const KeyDeclaration*,
XALAN_STD_QUALIFIER less<const KeyDeclaration*> > KeyDeclarationSetType;
typedef XALAN_STD_QUALIFIER pair<const XPath*, ClockType> XPathCacheEntry;
- typedef XALAN_STD_QUALIFIER map<XalanDOMString,
- XPathCacheEntry,
- XALAN_STD_QUALIFIER less<XalanDOMString> > XPathCacheMapType;
+ typedef XalanMap <XalanDOMString,
+ XPathCacheEntry,
+ DOMStringHashFunction> XPathCacheMapType;
typedef XALAN_STD_QUALIFIER deque<const ElemTemplate*> CurrentTemplateStackType;
typedef Stylesheet::KeyTablesTableType KeyTablesTableType;
1.20 +1 -1 xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StylesheetRoot.cpp 31 Jul 2004 05:08:50 -0000 1.19
+++ StylesheetRoot.cpp 31 Aug 2004 14:20:27 -0000 1.20
@@ -78,7 +78,7 @@
StylesheetRoot::StylesheetRoot(
const XalanDOMString& baseIdentifier,
StylesheetConstructionContext& constructionContext) :
- Stylesheet(*this,
+ Stylesheet(*this,
baseIdentifier,
constructionContext),
m_version(),
1.11 +3 -2 xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.hpp
Index: StylesheetRoot.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StylesheetRoot.hpp 31 Jul 2004 06:05:08 -0000 1.10
+++ StylesheetRoot.hpp 31 Aug 2004 14:20:27 -0000 1.11
@@ -58,9 +58,10 @@
typedef XalanVector<const XalanQName*> XalanQNameVectorType;
typedef XalanVector<ElemAttributeSet*> AttributeSetVectorType;
- typedef XALAN_STD_QUALIFIER map<const XalanQName*,
+ typedef XalanMap<const XalanQName*,
AttributeSetVectorType,
- pointer_less<const XalanQName> > AttributeSetMapType;
+ XalanHashMemberPointer<XalanQName>,
+ pointer_equal<const XalanQName> > AttributeSetMapType;
/**
* Construct a Stylesheet from a Document.
1.13 +2 -4 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSLTEngineImpl.hpp 13 Aug 2004 15:49:47 -0000 1.12
+++ XSLTEngineImpl.hpp 31 Aug 2004 14:20:27 -0000 1.13
@@ -32,7 +32,6 @@
// Standard library headers
#include <cassert>
#include <ctime>
-#include <map>
#include <set>
@@ -48,6 +47,7 @@
#include <xalanc/Include/XalanAutoPtr.hpp>
+#include <xalanc/Include/XalanMap.hpp>
@@ -158,9 +158,7 @@
typedef XalanVector<TraceListener*> TraceListenerVectorType;
typedef XalanVector<const XalanDOMString*> XalanDOMStringPointerVectorType;
- typedef XALAN_STD_QUALIFIER map<const void*,
- ClockType,
- XALAN_STD_QUALIFIER less<const void*> > DurationsTableMapType;
+ typedef XalanMap<const void*, ClockType> DurationsTableMapType;
typedef XalanVector<bool> BoolVectorType;
1.18 +1 -1 xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp
Index: XalanExe.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XalanExe.cpp 31 Jul 2004 06:05:10 -0000 1.17
+++ XalanExe.cpp 31 Aug 2004 14:20:28 -0000 1.18
@@ -833,7 +833,7 @@
main(
int argc,
char* argv[])
-{
+ {
#if !defined(NDEBUG) && defined(_MSC_VER)
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
1.6 +7 -15 xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
Index: XalanSourceTreeDocument.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeDocument.hpp 12 Aug 2004 21:39:40 -0000 1.5
+++ XalanSourceTreeDocument.hpp 31 Aug 2004 14:20:28 -0000 1.6
@@ -22,7 +22,7 @@
-#include <map>
+#include <xalanc/Include/XalanMap.hpp>
@@ -31,6 +31,7 @@
#include <xalanc/Include/STLHelper.hpp>
+#include <xalanc/Include/XalanMap.hpp>
@@ -79,26 +80,17 @@
typedef XalanSourceTreeElementA::AttributesCountType AttributesCountType;
typedef XalanArrayAllocator<XalanSourceTreeAttr*> AttributesArrayAllocatorType;
-#if defined(XALAN_NO_STD_NAMESPACE)
- typedef map<
+ typedef XalanMap<
const XalanDOMChar*,
XalanSourceTreeElement*,
- less_null_terminated_arrays<XalanDOMChar> > ElementByIDMapType;
+ hash_null_terminated_arrays<XalanDOMChar>,
+ equal_null_terminated_arrays<XalanDOMChar> > ElementByIDMapType;
- typedef map<
+ typedef XalanMap<
XalanDOMString,
XalanDOMString,
- less<XalanDOMString> > UnparsedEntityURIMapType;
-#else
- typedef std::map<
- const XalanDOMChar*,
- XalanSourceTreeElement*,
- less_null_terminated_arrays<XalanDOMChar> > ElementByIDMapType;
+ DOMStringHashFunction> UnparsedEntityURIMapType;
- typedef std::map<
- XalanDOMString,
- XalanDOMString> UnparsedEntityURIMapType;
-#endif
/**
* Perform static initialization. See class XalanSourceTreeInit.
1.7 +3 -9 xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
Index: XalanSourceTreeParserLiaison.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanSourceTreeParserLiaison.hpp 13 Mar 2004 00:44:55 -0000 1.6
+++ XalanSourceTreeParserLiaison.hpp 31 Aug 2004 14:20:28 -0000 1.7
@@ -22,8 +22,7 @@
-// Standard Library header files.
-#include <map>
+#include <xalanc/Include/XalanMap.hpp>
@@ -345,14 +344,9 @@
XalanSourceTreeDocument*
createXalanSourceTreeDocument();
-#if defined(XALAN_NO_STD_NAMESPACE)
- typedef map<const XalanDocument*,
- XalanSourceTreeDocument*,
- less<const XalanDocument*> > DocumentMapType;
-#else
- typedef std::map<const XalanDocument*,
+ typedef XalanMap<const XalanDocument*,
XalanSourceTreeDocument*> DocumentMapType;
-#endif
+
protected:
1.8 +2 -9 xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
Index: XercesParserLiaison.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesParserLiaison.hpp 13 Mar 2004 00:44:56 -0000 1.7
+++ XercesParserLiaison.hpp 31 Aug 2004 14:20:28 -0000 1.8
@@ -23,7 +23,7 @@
// Standard Library header files.
-#include <map>
+#include <xalanc/Include/XalanMap.hpp>
@@ -529,14 +529,7 @@
#endif
};
-#if defined(XALAN_NO_STD_NAMESPACE)
- typedef map<const XalanDocument*,
- DocumentEntry,
- less<const XalanDocument*> > DocumentMapType;
-#else
- typedef std::map<const XalanDocument*,
- DocumentEntry> DocumentMapType;
-#endif
+ typedef XalanMap<const XalanDocument*, DocumentEntry> DocumentMapType;
/**
* This API is deprecated.
1.5 +3 -14 xml-xalan/c/src/xalanc/XercesParserLiaison/XercesWrapperToXalanNodeMap.hpp
Index: XercesWrapperToXalanNodeMap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesWrapperToXalanNodeMap.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesWrapperToXalanNodeMap.hpp 26 Feb 2004 23:07:14 -0000 1.4
+++ XercesWrapperToXalanNodeMap.hpp 31 Aug 2004 14:20:28 -0000 1.5
@@ -22,11 +22,7 @@
-#if defined(XALAN_USE_HASH_MAP)
-#include <hash_map>
-#else
-#include <map>
-#endif
+#include <xalanc/Include/XalanMap.hpp>
@@ -46,15 +42,8 @@
{
public:
-#if defined(XALAN_NO_STD_NAMESPACE)
- typedef map<const DOMNodeType*, XalanNode*, less<const DOMNodeType*> > XercesNodeMapType;
-#else
-#if defined(XALAN_USE_HASH_MAP)
- typedef std::hash_map<const DOMNodeType*, XalanNode*> XercesNodeMapType;
-#else
- typedef std::map<const DOMNodeType*, XalanNode*> XercesNodeMapType;
-#endif
-#endif
+
+ typedef XalanMap<const DOMNodeType*, XalanNode*> XercesNodeMapType;
XercesWrapperToXalanNodeMap();
1.4 +0 -4 xml-xalan/c/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp
Index: XercesElementBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesElementBridge.hpp 26 Feb 2004 23:07:15 -0000 1.3
+++ XercesElementBridge.hpp 31 Aug 2004 14:20:28 -0000 1.4
@@ -22,10 +22,6 @@
-#include <map>
-
-
-
#if XERCES_VERSION_MAJOR >= 2
#include <xercesc/dom/deprecated/DOM_Element.hpp>
#else
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org