dbertoni 00/08/15 12:43:44
Modified: c/src/XSLT ExtensionFunctionHandler.cpp
ExtensionFunctionHandler.hpp ExtensionNSHandler.cpp
ExtensionNSHandler.hpp FunctionKey.cpp
StylesheetConstructionContextDefault.hpp
StylesheetExecutionContextDefault.hpp
Log:
Changes for AIX.
Revision Changes Path
1.5 +41 -98 xml-xalan/c/src/XSLT/ExtensionFunctionHandler.cpp
Index: ExtensionFunctionHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionFunctionHandler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtensionFunctionHandler.cpp 2000/03/07 16:16:27 1.4
+++ ExtensionFunctionHandler.cpp 2000/08/15 19:43:43 1.5
@@ -78,7 +78,7 @@
* @author Sanjiva Weerawarana ([EMAIL PROTECTED])
*/
-ExtensionFunctionHandler::ExtensionFunctionHandler(const DOMString&
namespaceUri) :
+ExtensionFunctionHandler::ExtensionFunctionHandler(const XalanDOMString&
namespaceUri) :
m_namespaceUri(namespaceUri),
m_scriptLang(),
m_scriptSrc(),
@@ -97,26 +97,12 @@
-/////////////////////////////////////////////////////////////////////////
-
-/**
- * Construct a new extension namespace handler given all the information
- * needed.
- *
- * @param namespaceUri the extension namespace URI that I'm implementing
- * @param funcNames string containing list of functions of extension NS
- * @param lang language of code implementing the extension
- * @param srcURL value of src attribute (if any) - treated as a URL
- * or a classname depending on the value of lang. If
- * srcURL is not null, then scriptSrc is ignored.
- * @param scriptSrc the actual script code (if any)
- */
ExtensionFunctionHandler::ExtensionFunctionHandler (
- const
DOMString& namespaceUri,
- const
DOMString& funcNames,
- const
DOMString& lang,
- const
DOMString& srcURL,
- const
DOMString& src) :
+ const XalanDOMString& namespaceUri,
+ const XalanDOMString& funcNames,
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& src) :
m_namespaceUri(namespaceUri),
m_scriptLang(lang),
m_scriptSrc(src),
@@ -127,130 +113,86 @@
{
setFunctions (funcNames);
}
+
-/////////////////////////////////////////////////////////////////////////
-// Main API
-/////////////////////////////////////////////////////////////////////////
-
-/**
- * Set function local parts of extension NS.
- *
- * @param functions whitespace separated list of function names defined
- * by this extension namespace.
- */
-void ExtensionFunctionHandler::setFunctions (const DOMString& funcNames)
+
+void
+ExtensionFunctionHandler::setFunctions(const XalanDOMString& funcNames)
{
if (isEmpty(funcNames))
{
return;
}
- StringTokenizer st(funcNames, " \t\n\r", false);
- while (st.hasMoreTokens ())
+
+ StringTokenizer st(funcNames, " \t\n\r", false);
+
+ while (st.hasMoreTokens() == true)
{
- DOMString tok = st.nextToken();
- m_functions.insert(tok);
+ m_functions.insert(st.nextToken());
}
}
+
-/////////////////////////////////////////////////////////////////////////
-
-/**
- * Set the script data for this extension NS. If srcURL is !null then
- * the script body is read from that URL. If not the scriptSrc is used
- * as the src. This method does not actually execute anything - that's
- * done when the component is first hit by the user by an element or
- * a function call.
- *
- * @param lang language of the script.
- * @param srcURL value of src attribute (if any) - treated as a URL
- * or a classname depending on the value of lang. If
- * srcURL is not null, then scriptSrc is ignored.
- * @param scriptSrc the actual script code (if any)
- */
-void ExtensionFunctionHandler::setScript (const DOMString& lang,
- const DOMString& srcURL,
- const DOMString&
scriptSrc)
+void
+ExtensionFunctionHandler::setScript(
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& scriptSrc)
{
m_scriptLang = lang;
m_scriptSrcURL = srcURL;
m_scriptSrc = scriptSrc;
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * Tests whether a certain function name is known within this namespace.
- *
- * @param function name of the function being tested
- *
- * @return true if its known, false if not.
- */
-bool ExtensionFunctionHandler::isFunctionAvailable (const DOMString&
function)
+
+bool
+ExtensionFunctionHandler::isFunctionAvailable (const XalanDOMString&
function) const
{
return m_functions.find(function) != m_functions.end();
}
+
-/////////////////////////////////////////////////////////////////////////
-/**
- * Process a call to a function.
- *
- * @param funcName Function name.
- * @param args The arguments of the function call.
- *
- * @return the return value of the function evaluation.
- *
- * @exception XSLProcessorException thrown if something goes wrong
- * while running the extension handler.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading trouble
- * @exception SAXException if parsing trouble
- */
XObject*
ExtensionFunctionHandler::callFunction(
- const DOMString& /* funcName */,
- const ArgVector& /* args */)
+ const XalanDOMString& /* funcName */,
+ const ArgVectorType& /* args */)
{
assert(0); // @@ TODO: Not implemented
+
if (!m_componentStarted)
{
- startupComponent ();
+ startupComponent();
}
- // System.out.println("Extensions not implemented!");
return 0;
}
+
-/////////////////////////////////////////////////////////////////////////
-// Private/Protected Functions
-/////////////////////////////////////////////////////////////////////////
-
-/**
- * Start the component up by executing any script that needs to run
- * at startup time. This needs to happen before any functions can be
- * called on the component.
- *
- * @exception XPathProcessorException if something bad happens.
- */
-void ExtensionFunctionHandler::startupComponent()
+void
+ExtensionFunctionHandler::startupComponent()
{
// special case the javaclass engine - the scriptSrcURL is
// the class name to run. If it starts with class: then use the
// class object with that name instead of init'ing it as the
// target of the calls later
- if (m_scriptLang.equals ("javaclass"))
+ if (equals(m_scriptLang, "javaclass"))
{
try
{
- DOMString cname = m_scriptSrcURL;
+ XalanDOMString cname = m_scriptSrcURL;
+
bool isClass = false;
- if (startsWith (m_scriptSrcURL, "class:"))
+
+ if (startsWith(m_scriptSrcURL, "class:"))
{
- cname = substring (m_scriptSrcURL, 6);
+ cname = substring(m_scriptSrcURL, 6);
+
isClass = true;
}
+
// @@ JMD: Can't do this in C++
/*
Class cl = Class.forName (cname);
@@ -301,5 +243,6 @@
throw new XPathProcessorException (bsfe.getMessage (), bsfe);
}
*/
+
m_componentStarted = true;
}
1.5 +52 -28 xml-xalan/c/src/XSLT/ExtensionFunctionHandler.hpp
Index: ExtensionFunctionHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionFunctionHandler.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtensionFunctionHandler.hpp 2000/03/01 20:43:42 1.4
+++ ExtensionFunctionHandler.hpp 2000/08/15 19:43:43 1.5
@@ -61,8 +61,10 @@
#if !defined(XALAN_EXTENSIONFUNCTIONHANDLER_HEADER_GUARD)
#define XALAN_EXTENSIONFUNCTIONHANDLER_HEADER_GUARD
+
+
// Base include file. Must be first.
-#include "XSLTDefinitions.hpp"
+#include <XSLT/XSLTDefinitions.hpp>
@@ -71,7 +73,7 @@
-#include <dom/DOMString.hpp>
+#include <XalanDOM/XalanDOMString.hpp>
@@ -96,7 +98,7 @@
*
* @param namespaceUri the extension namespace URI that I'm implementing
*/
- ExtensionFunctionHandler (const DOMString& namespaceUri);
+ ExtensionFunctionHandler(const XalanDOMString& namespaceUri);
/**
* Construct a new extension namespace handler given all the information
@@ -110,14 +112,16 @@
* srcURL is not null, then scriptSrc is ignored.
* @param scriptSrc the actual script code (if any)
*/
- ExtensionFunctionHandler (const DOMString& namespaceUri,
-
const DOMString& funcNames,
-
const DOMString& lang,
-
const DOMString& srcURL,
-
const DOMString& scriptSrc);
+ ExtensionFunctionHandler(
+ const XalanDOMString& namespaceUri,
+ const XalanDOMString& funcNames,
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& scriptSrc);
- virtual ~ExtensionFunctionHandler();
+ virtual
+ ~ExtensionFunctionHandler();
/**
* Set function local parts of extension NS.
@@ -125,8 +129,9 @@
* @param functions whitespace separated list of function names defined
* by this extension namespace.
*/
- virtual void setFunctions (const DOMString& funcNames);
-
+ virtual void
+ setFunctions(const XalanDOMString& funcNames);
+
/**
* Set the script data for this extension NS. If srcURL is !null then
* the script body is read from that URL. If not the scriptSrc is used
@@ -140,9 +145,11 @@
* srcURL is not null, then scriptSrc is ignored.
* @param scriptSrc the actual script code (if any)
*/
- virtual void setScript (const DOMString& lang,
- const
DOMString& srcURL,
- const
DOMString& scriptSrc);
+ virtual void
+ setScript(
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& scriptSrc);
/**
* Tests whether a certain function name is known within this namespace.
@@ -150,11 +157,15 @@
* @param function name of the function being tested
* @return true if its known, false if not.
*/
- virtual bool isFunctionAvailable (const DOMString& function);
+ virtual bool
+ isFunctionAvailable(const XalanDOMString& function) const;
-
/// Vector of pointers to function arguments
- typedef std::vector<void*> ArgVector;
+#if defined(XALAN_NO_NAMESPACES)
+ typedef vector<void*> ArgVectorType;
+#else
+ typedef std::vector<void*> ArgVectorType;
+#endif
/**
* Process a call to a function.
@@ -172,20 +183,32 @@
* @exception SAXException if parsing trouble
*/
- virtual XObject* callFunction (const DOMString& funcName, const
ArgVector& args);
+ virtual XObject*
+ callFunction(
+ const XalanDOMString& funcName,
+ const ArgVectorType& args);
protected:
+
+ XalanDOMString m_namespaceUri; // uri of the extension namespace
+ XalanDOMString m_scriptLang; // scripting language of implementation
+ XalanDOMString m_scriptSrc; // script source to run (if any)
+ XalanDOMString m_scriptSrcURL; // URL of source of script (if any)
- DOMString m_namespaceUri; // uri of the extension namespace
- DOMString m_scriptLang; // scripting language of implementation
- DOMString m_scriptSrc; // script source to run (if any)
- DOMString m_scriptSrcURL; // URL of source of script (if any)
- // @@
void* m_javaObject; // object for javaclass engine
- typedef std::set<DOMString> StringSetType;
- StringSetType m_functions; // functions of namespace
+
+#if defined(XALAN_NO_NAMESPACES)
+ typedef set<XalanDOMString, less<XalanDOMString> > StringSetType;
+#else
+ typedef std::set<XalanDOMString> StringSetType;
+#endif
+
+ StringSetType m_functions; // functions of namespace
+
// BSFManager mgr = new BSFManager (); // mgr used to run scripts
- bool m_componentStarted; // true when the scripts in a
+
+ bool m_componentStarted; // true when the scripts in
a
+
// component description (if any) have been run
/**
@@ -195,9 +218,10 @@
*
* @exception XPathProcessorException if something bad happens.
*/
- virtual void startupComponent();
+ virtual void
+ startupComponent();
};
-#endif // XALAN_EXTENSIONFUNCTIONHANDLER_HEADER_GUARD
+#endif // XALAN_EXTENSIONFUNCTIONHANDLER_HEADER_GUARD
1.7 +52 -122 xml-xalan/c/src/XSLT/ExtensionNSHandler.cpp
Index: ExtensionNSHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionNSHandler.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExtensionNSHandler.cpp 2000/08/10 18:43:05 1.6
+++ ExtensionNSHandler.cpp 2000/08/15 19:43:43 1.7
@@ -113,7 +113,7 @@
*
* @param namespaceUri the extension namespace URI that I'm implementing
*/
-ExtensionNSHandler::ExtensionNSHandler(const XalanDOMString&
namespaceUri) :
+ExtensionNSHandler::ExtensionNSHandler(const XalanDOMString& namespaceUri) :
ExtensionFunctionHandler(namespaceUri),
m_elements(),
m_componentDescLoaded(false)
@@ -137,121 +137,80 @@
* @param scriptSrc the actual script code (if any)
*/
ExtensionNSHandler::ExtensionNSHandler (
- const XalanDOMString& namespaceUri,
- const XalanDOMString& elemNames,
- const XalanDOMString& funcNames,
- const XalanDOMString& lang,
- const XalanDOMString& srcURL,
- const XalanDOMString& src) :
- ExtensionFunctionHandler (namespaceUri, funcNames, lang,
srcURL, src),
+ const XalanDOMString& namespaceUri,
+ const XalanDOMString& elemNames,
+ const XalanDOMString& funcNames,
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& src) :
+ ExtensionFunctionHandler(namespaceUri, funcNames, lang, srcURL, src),
m_elements(),
m_componentDescLoaded(true)
{
- setElements (elemNames);
+ setElements(elemNames);
}
-/////////////////////////////////////////////////////////////////////////
-// Main API
-/////////////////////////////////////////////////////////////////////////
-
-/*
-* Set function local parts of extension NS. Super does the work; I
-* just record that a component desc has been loaded.
-*
-* @param functions whitespace separated list of function names defined
-* by this extension namespace.
-*/
-void ExtensionNSHandler::setFunctions (const XalanDOMString& funcNames)
+void
+ExtensionNSHandler::setFunctions(const XalanDOMString& funcNames)
{
- ExtensionFunctionHandler::setFunctions (funcNames);
+ ExtensionFunctionHandler::setFunctions(funcNames);
+
m_componentDescLoaded = true;
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * Set the script data for this extension NS. Deferred to super for
- * actual work - I only record that a component desc has been loaded.
- *
- * @param lang language of the script.
- * @param srcURL value of src attribute (if any) - treated as a
URL
- * or a
classname depending on the value of lang. If
- * srcURL
is not null, then scriptSrc is ignored.
- * @param scriptSrc the actual script code (if any)
- */
-void ExtensionNSHandler::setScript (const XalanDOMString& lang, const
XalanDOMString& srcURL, const XalanDOMString& scriptSrc)
+
+void
+ExtensionNSHandler::setScript(
+ const XalanDOMString& lang,
+ const XalanDOMString& srcURL,
+ const XalanDOMString& scriptSrc)
{
- ExtensionFunctionHandler::setScript (lang, srcURL, scriptSrc);
+ ExtensionFunctionHandler::setScript(lang, srcURL, scriptSrc);
+
m_componentDescLoaded = true;
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * Set element local parts of extension NS.
- *
- * @param elemNames whitespace separated list of element names defined
- * by this extension namespace.
- */
-void ExtensionNSHandler::setElements (const XalanDOMString& elemNames)
+
+void
+ExtensionNSHandler::setElements(const XalanDOMString& elemNames)
{
- if (elemNames.length() == 0)
- return;
- StringTokenizer st(elemNames, " \t\n\r", false);
- while (st.hasMoreTokens())
- {
- XalanDOMString tok = st.nextToken();
- m_elements.insert(tok); // just stick it in there basically
- }
- m_componentDescLoaded = true;
+ if (length(elemNames) != 0)
+ {
+ StringTokenizer st(elemNames, " \t\n\r", false);
+
+ while (st.hasMoreTokens() == true)
+ {
+ m_elements.insert(st.nextToken()); // just stick it in there
basically
+ }
+
+ m_componentDescLoaded = true;
+ }
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * Tests whether a certain element name is known within this namespace.
- * @param element name of the element being tested
- * @return true if its known, false if not.
- */
-bool ExtensionNSHandler::isElementAvailable (const XalanDOMString& element)
+
+bool
+ExtensionNSHandler::isElementAvailable(const XalanDOMString& element) const
{
return (m_elements.find(element) != m_elements.end());
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * Process a call to this extension namespace via an element. As a side
- * effect, the results are sent to the XSLTProcessor's result tree.
- *
- * @param localPart Element name's local part.
- * @param element The extension element being
processed.
- * @param processor Handle to XSLTProcessor.
- * @param stylesheetTree The compiled stylesheet tree.
- * @param mode The current mode.
- * @param sourceTree The root of the source tree (but don't assume
- *
it's a Document).
- * @param sourceNode The current context node.
- *
- * @exception XSLProcessorException thrown if something goes wrong
- * while running the extension
handler.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading
trouble
- * @exception SAXException if parsing
trouble
- */
+
void
ExtensionNSHandler::processElement(
StylesheetExecutionContext&
executionContext,
const XalanDOMString& localPart,
const XalanElement* /*
element */,
- Stylesheet&
stylesheetTree,
- const XalanNode*
sourceTree,
- const XalanNode*
sourceNode,
- const QName& mode)
+ Stylesheet&
/* stylesheetTree */,
+ const XalanNode* /*
sourceTree */,
+ const XalanNode* /*
sourceNode */,
+ const QName& /* mode
*/)
{
const XObject* result = 0;
@@ -261,7 +220,7 @@
{
startupComponent();
- ExtensionFunctionHandler::ArgVector argv;
+ ArgVectorType argv;
// XSLProcessorContext xpc(processor,
// stylesheetTree, sourceTree, sourceNode,
mode);
@@ -295,17 +254,6 @@
-/////////////////////////////////////////////////////////////////////////
-// Private/Protected Functions
-/////////////////////////////////////////////////////////////////////////
-
-/**
- * Start the component up by executing any script that needs to run
- * at startup time. This needs to happen before any functions can be
- * called on the component.
- *
- * @exception XPathProcessorException if something bad happens.
- */
void
ExtensionNSHandler::startupComponent()
{
@@ -313,7 +261,7 @@
{
try
{
- loadComponentDescription ();
+ loadComponentDescription();
}
catch (...)
// catch (Exception e)
@@ -322,21 +270,12 @@
//@@ TODO: Error reporting, or throw
}
}
- ExtensionFunctionHandler::startupComponent ();
+
+ ExtensionFunctionHandler::startupComponent();
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * Load the component spec for this extension namespace taking the URI
- * of this namespace as the URL to read from.
- *
- * @exception XSLProcessorException if something bad happens.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading
trouble
- * @exception SAXException if parsing
trouble
- */
+
void
ExtensionNSHandler::loadComponentDescription()
{
@@ -393,25 +332,15 @@
m_componentDescLoaded = true;
*/
}
-/////////////////////////////////////////////////////////////////////////
-/**
- * extract the text nodes and CDATA content children of the given
- * elem and return as a string. Any other types of node children
- * are ignored
- *
- * @param elem element whose text and cdata children are to be
- * concatenated together.
- *
- * @return string resulting from concatenating the text/cdata child
- * nodes' values.
- */
+
+
XalanDOMString
ExtensionNSHandler::getScriptString(const XalanElement& elem)
{
XalanDOMString strBuf;
- for (const XalanNode* n = elem.getFirstChild (); n != 0; n =
n->getNextSibling ())
+ for (const XalanNode* n = elem.getFirstChild (); n != 0; n =
n->getNextSibling())
{
switch (n->getNodeType())
{
@@ -419,6 +348,7 @@
case XalanNode::CDATA_SECTION_NODE:
strBuf += n->getNodeValue();
break;
+
default:
break;
}
1.6 +1 -4 xml-xalan/c/src/XSLT/ExtensionNSHandler.hpp
Index: ExtensionNSHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ExtensionNSHandler.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExtensionNSHandler.hpp 2000/08/10 18:43:05 1.5
+++ ExtensionNSHandler.hpp 2000/08/15 19:43:43 1.6
@@ -142,7 +142,6 @@
const XalanDOMString& srcURL,
const XalanDOMString& scriptSrc);
-
/**
* Set element local parts of extension NS.
*
@@ -151,7 +150,6 @@
*/
void
setElements(const XalanDOMString& elemNames);
-
/**
* Tests whether a certain element name is known within this namespace.
@@ -160,8 +158,7 @@
* @return true if known, false if not
*/
bool
- isElementAvailable (const XalanDOMString& element);
-
+ isElementAvailable (const XalanDOMString& element) const;
/**
* Process a call to this extension namespace via an element. As a side
1.10 +5 -3 xml-xalan/c/src/XSLT/FunctionKey.cpp
Index: FunctionKey.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionKey.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionKey.cpp 2000/08/14 22:08:05 1.9
+++ FunctionKey.cpp 2000/08/15 19:43:43 1.10
@@ -155,11 +155,13 @@
if (nRefs > 0)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::set;
+#if defined(XALAN_NO_NAMESPACES)
+ typedef set<XalanDOMString,
less<XalanDOMString> > StringSetType;
+#else
+ typedef std::set<XalanDOMString>
StringSetType;
#endif
- set<XalanDOMString> usedrefs;
+ StringSetType usedrefs;
for(unsigned int i = 0; i < nRefs; i++)
{
1.12 +7 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StylesheetConstructionContextDefault.hpp 2000/08/11 21:15:46 1.11
+++ StylesheetConstructionContextDefault.hpp 2000/08/15 19:43:43 1.12
@@ -216,14 +216,17 @@
XPathFactory& m_xpathFactory;
#if defined(XALAN_NO_NAMESPACES)
- auto_ptr<XPathProcessor> m_xpathProcessor;
+ typedef auto_ptr<XPathProcessor> XPathProcessAutoPtr;
- typedef set<StylesheetRoot*> StylesheetSetType;
+ typedef set<StylesheetRoot*,
+ less<StylesheetRoot*> >
StylesheetSetType;
#else
- std::auto_ptr<XPathProcessor> m_xpathProcessor;
+ typedef std::auto_ptr<XPathProcessor> XPathProcessAutoPtr;
- typedef std::set<StylesheetRoot*> StylesheetSetType;
+ typedef std::set<StylesheetRoot*> StylesheetSetType;
#endif
+
+ XPathProcessAutoPtr
m_xpathProcessor;
StylesheetSetType m_stylesheets;
};
1.29 +8 -4
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StylesheetExecutionContextDefault.hpp 2000/08/15 15:18:33 1.28
+++ StylesheetExecutionContextDefault.hpp 2000/08/15 19:43:43 1.29
@@ -794,10 +794,14 @@
#if defined(XALAN_NO_NAMESPACES)
typedef deque<const ElemTemplateElement*>
ElementRecursionStackType;
- typedef set<FormatterListener*>
FormatterListenerSetType;
- typedef set<PrintWriter*>
PrintWriterSetType;
- typedef set<TextOutputStream*>
TextOutputStreamSetType;
- typedef set<const KeyDeclaration*>
KeyDeclarationSetType;
+ typedef set<FormatterListener*,
+ less<FormatterListener*> >
FormatterListenerSetType;
+ typedef set<PrintWriter*,
+ less<PrintWriter*> >
PrintWriterSetType;
+ typedef set<TextOutputStream*,
+ less<TextOutputStream*> >
TextOutputStreamSetType;
+ typedef set<const KeyDeclaration*,
+ less<const KeyDeclaration*> >
KeyDeclarationSetType;
typedef vector<const XObject*>
VariablesCollectionType;
typedef vector<VariablesCollectionType>
LiveVariablesStackType;
typedef pair<const XPath*, clock_t>
XPathCacheEntry;
