dbertoni 01/08/13 10:09:08
Modified: c/src/XalanTransformer XalanTransformer.cpp
XalanTransformer.hpp
Log:
Fixed QName collisions with Xerces.
Revision Changes Path
1.26 +2 -2 xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XalanTransformer.cpp 2001/06/29 21:49:49 1.25
+++ XalanTransformer.cpp 2001/08/13 17:09:08 1.26
@@ -941,7 +941,7 @@
const XalanDOMString& functionName,
const Function& function)
{
- m_functionPairs.push_back(FunctionPairType(QNameByValue(theNamespace,
functionName), function.clone()));
+ m_functionPairs.push_back(FunctionPairType(XalanQNameByValue(theNamespace,
functionName), function.clone()));
}
@@ -967,7 +967,7 @@
{
for (FunctionParamPairVectorType::size_type i = 0; i < m_functionPairs.size();
++i)
{
- if(QNameByReference(theNamespace,
functionName).equals(m_functionPairs[i].first))
+ if(XalanQNameByReference(theNamespace,
functionName).equals(m_functionPairs[i].first))
{
delete m_functionPairs[i].second;
1.28 +3 -3 xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp
Index: XalanTransformer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XalanTransformer.hpp 2001/06/22 20:54:29 1.27
+++ XalanTransformer.hpp 2001/08/13 17:09:08 1.28
@@ -68,7 +68,7 @@
-#include <XPath/QNameByValue.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -429,14 +429,14 @@
typedef vector<const XalanParsedSource*>
ParsedSourcePtrVectorType;
typedef pair<XalanDOMString, XalanDOMString> ParamPairType;
typedef vector<ParamPairType>
ParamPairVectorType;
- typedef pair<QNameByValue, Function*>
FunctionPairType;
+ typedef pair<XalanQNameByValue, Function*>
FunctionPairType;
typedef vector<FunctionPairType>
FunctionParamPairVectorType;
#else
typedef std::vector<const XalanCompiledStylesheet*>
CompiledStylesheetPtrVectorType;
typedef std::vector<const XalanParsedSource*>
ParsedSourcePtrVectorType;
typedef std::pair<XalanDOMString, XalanDOMString> ParamPairType;
typedef std::vector<ParamPairType>
ParamPairVectorType;
- typedef std::pair<QNameByValue, Function*>
FunctionPairType;
+ typedef std::pair<XalanQNameByValue, Function*> FunctionPairType;
typedef std::vector<FunctionPairType>
FunctionParamPairVectorType;
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
