dbertoni 01/07/18 21:38:27
Modified: c/src/XalanExtensions FunctionDistinct.cpp
FunctionNodeSet.cpp
Log:
Fixed problems with casts and template parameters.
Revision Changes Path
1.4 +7 -5 xml-xalan/c/src/XalanExtensions/FunctionDistinct.cpp
Index: FunctionDistinct.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionDistinct.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionDistinct.cpp 2001/07/18 06:24:55 1.3
+++ FunctionDistinct.cpp 2001/07/19 04:38:27 1.4
@@ -119,17 +119,19 @@
}
else if (theLength > 1)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::set;
-#endif
-
typedef XPathExecutionContext::GetAndReleaseCachedString
GetAndReleaseCachedString;
GetAndReleaseCachedString theGuard(executionContext);
XalanDOMString& theCachedString =
theGuard.get();
+
+#if defined(XALAN_NO_NAMESPACES)
+ typedef set<XalanDOMString, less<XalanDOMString> > SetType;
+#else
+ typedef std::set<XalanDOMString>
SetType;
+#endif
- set<XalanDOMString> theStrings;
+ SetType theStrings;
// Check to make sure each node has a unique
// string value.
1.3 +9 -1 xml-xalan/c/src/XalanExtensions/FunctionNodeSet.cpp
Index: FunctionNodeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionNodeSet.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionNodeSet.cpp 2001/07/18 04:20:35 1.2
+++ FunctionNodeSet.cpp 2001/07/19 04:38:27 1.3
@@ -69,7 +69,11 @@
XResultTreeFragNodeSetProxy(const XObjectPtr& theXObject) :
m_xobject(theXObject),
+#if defined(XALAN_OLD_STYLE_CASTS)
+ m_proxy(*(const XResultTreeFrag*)theXObject.get())
+#else
m_proxy(*static_cast<const XResultTreeFrag*>(theXObject.get()))
+#endif
{
assert(theXObject.null() == false);
assert(theXObject->getType() == XObject::eTypeResultTreeFrag);
@@ -77,7 +81,11 @@
XResultTreeFragNodeSetProxy(const XResultTreeFragNodeSetProxy&
theSource) :
m_xobject(theSource.m_xobject),
+#if defined(XALAN_OLD_STYLE_CASTS)
+ m_proxy(*(const XResultTreeFrag*)m_xobject.get())
+#else
m_proxy(*static_cast<const XResultTreeFrag*>(m_xobject.get()))
+#endif
{
}
@@ -208,7 +216,7 @@
FunctionNodeSet::execute(
XPathExecutionContext&
executionContext,
XalanNode*
context,
- int
opPos,
+ int
/* opPos */,
const XObjectArgVectorType& args)
{
if (args.size() != 1)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
