dbertoni 00/08/15 08:18:33
Modified: c/src/XSLT StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
Log:
Removed use of mutable keyword.
Revision Changes Path
1.28 +9 -9 xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StylesheetExecutionContext.hpp 2000/08/14 22:08:07 1.27
+++ StylesheetExecutionContext.hpp 2000/08/15 15:18:33 1.28
@@ -1493,29 +1493,29 @@
const XalanDOMChar* theRHS) const = 0;
/**
- * Determine if a keydeclaration is being constructed.
+ * Determine if a KeyDeclaration is being constructed.
*
- * @param id keydeclaration
+ * @param The KeyDeclaration in question.
* @return true if being constructed
*/
virtual bool
- getInConstruction(const KeyDeclaration& keyDeclaration) const = 0;
+ getInConstruction(const KeyDeclaration& keyDeclaration) const =
0;
/**
- * Add keydeclaration to construction list.
+ * Add KeyDeclaration to construction list.
*
- * @param keydeclaration being constructed
+ * @param KeyDeclaration being constructed
*/
virtual void
- beginConstruction(const KeyDeclaration& keyDeclaration) const = 0;
+ beginConstruction(const KeyDeclaration& keyDeclaration) = 0;
/**
- * Remove keydeclaration from construction list.
+ * Remove KeyDeclaration from construction list.
*
- * @param constructed keydeclaration
+ * @param constructed KeyDeclaration
*/
virtual void
- endConstruction(const KeyDeclaration& keyDeclaration) const = 0;
+ endConstruction(const KeyDeclaration& keyDeclaration) = 0;
// These interfaces are inherited from XPathExecutionContext...
1.30 +28 -27
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StylesheetExecutionContextDefault.cpp 2000/08/14 22:08:08 1.29
+++ StylesheetExecutionContextDefault.cpp 2000/08/15 15:18:33 1.30
@@ -73,7 +73,6 @@
-#include <XPath/ElementPrefixResolverProxy.hpp>
#include <XPath/QName.hpp>
#include <XPath/ResultTreeFragBase.hpp>
#include <XPath/XObjectFactory.hpp>
@@ -114,33 +113,8 @@
const StylesheetExecutionContextDefault::DefaultCollationCompareFunctor
StylesheetExecutionContextDefault::s_defaultFunctor;
-bool
-StylesheetExecutionContextDefault::getInConstruction(const KeyDeclaration&
keyDeclaration) const
-{
- return m_keyDeclarationSet.count(&keyDeclaration)?true:false;
-}
-void
-StylesheetExecutionContextDefault::beginConstruction(const KeyDeclaration&
keyDeclaration) const
-{
-#if defined(XALAN_NO_MUTABLE)
-
((StylesheetExecutionContextDefault*)this)->m_keyDeclarationSet.insert(&keyDeclaration);
-#else
- m_keyDeclarationSet.insert(&keyDeclaration);
-#endif
-}
-
-void
-StylesheetExecutionContextDefault::endConstruction(const KeyDeclaration&
keyDeclaration) const
-{
-#if defined(XALAN_NO_MUTABLE)
-
((StylesheetExecutionContextDefault*)this)->m_keyDeclarationSet.erase(&keyDeclaration);
-#else
- m_keyDeclarationSet.erase(&keyDeclaration);
-#endif
-}
-
StylesheetExecutionContextDefault::StylesheetExecutionContextDefault(
XSLTEngineImpl& xsltProcessor,
XPathEnvSupport& theXPathEnvSupport,
@@ -168,7 +142,8 @@
m_liveVariablesStack(),
m_variablesStack(),
m_matchPatternCache(),
- m_keyTables()
+ m_keyTables(),
+ m_keyDeclarationSet()
{
m_liveVariablesStack.reserve(eDefaultVariablesStackSize);
}
@@ -1348,6 +1323,30 @@
+bool
+StylesheetExecutionContextDefault::getInConstruction(const KeyDeclaration&
keyDeclaration) const
+{
+ return m_keyDeclarationSet.count(&keyDeclaration)?true:false;
+}
+
+
+
+void
+StylesheetExecutionContextDefault::beginConstruction(const KeyDeclaration&
keyDeclaration)
+{
+ m_keyDeclarationSet.insert(&keyDeclaration);
+}
+
+
+
+void
+StylesheetExecutionContextDefault::endConstruction(const KeyDeclaration&
keyDeclaration)
+{
+ m_keyDeclarationSet.erase(&keyDeclaration);
+}
+
+
+
XalanNode*
StylesheetExecutionContextDefault::getCurrentNode() const
{
@@ -2043,6 +2042,8 @@
// Add the XPath with the current clock
m_matchPatternCache.insert(XPathCacheMapType::value_type(pattern,
XPathCacheEntry(theXPath, addClock)));
}
+
+
KeyTable*
1.28 +6 -6
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StylesheetExecutionContextDefault.hpp 2000/08/14 22:08:08 1.27
+++ StylesheetExecutionContextDefault.hpp 2000/08/15 15:18:33 1.28
@@ -533,10 +533,10 @@
getInConstruction(const KeyDeclaration& keyDeclaration) const;
virtual void
- beginConstruction(const KeyDeclaration& keyDeclaration) const;
+ beginConstruction(const KeyDeclaration& keyDeclaration);
virtual void
- endConstruction(const KeyDeclaration& keyDeclaration) const;
+ endConstruction(const KeyDeclaration& keyDeclaration);
// These interfaces are inherited from XPathExecutionContext...
@@ -844,15 +844,15 @@
XPathCacheMapType
m_matchPatternCache;
+ KeyTablesTableType m_keyTables;
+
+ KeyDeclarationSetType m_keyDeclarationSet;
+
static XalanNumberFormatFactory
s_defaultXalanNumberFormatFactory;
static XalanNumberFormatFactory* s_xalanNumberFormatFactory;
const static DefaultCollationCompareFunctor
s_defaultFunctor;
-
- mutable KeyTablesTableType m_keyTables;
-
- mutable KeyDeclarationSetType m_keyDeclarationSet;
};
