dbertoni 2003/01/01 18:36:26
Modified: c/src/XSLT StylesheetConstructionContextDefault.cpp
StylesheetConstructionContextDefault.hpp
Log:
Made static class member and instance member. Fix for bugzilla 15749.
Revision Changes Path
1.33 +4 -10
xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp
Index: StylesheetConstructionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StylesheetConstructionContextDefault.cpp 21 Dec 2002 00:21:25 -0000
1.32
+++ StylesheetConstructionContextDefault.cpp 2 Jan 2003 02:36:26 -0000
1.33
@@ -53,8 +53,6 @@
* Business Machines, Inc., http://www.ibm.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
- *
- * @author <a href="mailto:[email protected]";>David N. Bertoni</a>
*/
#include "StylesheetConstructionContextDefault.hpp"
@@ -149,7 +147,8 @@
m_elemTemplateAllocator(eDefaultElemTemplateBlockSize),
m_elemTextLiteralAllocator(eDefaultElemTextLiteralBlockSize),
m_elemValueOfAllocator(eDefaultElemValueOfBlockSize),
- m_elemVariableAllocator(eDefaultElemVariableBlockSize)
+ m_elemVariableAllocator(eDefaultElemVariableBlockSize),
+ m_spaceAttrQName(DOMServices::s_XMLNamespaceURI,
Constants::ATTRNAME_SPACE)
{
}
@@ -646,7 +645,7 @@
m_scratchQName.set(theAttributeName, theStylesheet.getNamespaces(),
theLocator, true);
- return s_spaceAttrQName.equals(m_scratchQName);
+ return m_spaceAttrQName == m_scratchQName;
}
@@ -661,7 +660,7 @@
m_scratchQName.set(theAttributeName, theStylesheet.getNamespaces(),
theLocator, true);
- return m_useAttributeSetsQName.equals(m_scratchQName);
+ return m_useAttributeSetsQName == m_scratchQName;
}
@@ -1293,11 +1292,6 @@
return theResult;
}
}
-
-
-
-const XalanQNameByReference
StylesheetConstructionContextDefault::s_spaceAttrQName(DOMServices::s_XMLNamespaceURI,
Constants::ATTRNAME_SPACE);
-
1.31 +1 -1
xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.hpp
Index: StylesheetConstructionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.hpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StylesheetConstructionContextDefault.hpp 25 Nov 2002 18:11:53 -0000
1.30
+++ StylesheetConstructionContextDefault.hpp 2 Jan 2003 02:36:26 -0000
1.31
@@ -582,7 +582,7 @@
XalanElemVariableAllocator
m_elemVariableAllocator;
- static const XalanQNameByReference s_spaceAttrQName;
+ const XalanQNameByReference
m_spaceAttrQName;
// Static strings for stylesheet compilation...
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
