dbertoni 2002/11/25 11:07:14
Modified: c/src/XalanExtensions FunctionDifference.cpp
FunctionDifference.hpp FunctionDistinct.cpp
FunctionDistinct.hpp FunctionEvaluate.cpp
FunctionEvaluate.hpp FunctionHasSameNodes.cpp
FunctionHasSameNodes.hpp FunctionIntersection.cpp
FunctionIntersection.hpp FunctionNodeSet.cpp
FunctionNodeSet.hpp XalanExtensions.cpp
XalanExtensions.hpp XalanExtensionsDefinitions.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.8 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionDifference.cpp
Index: FunctionDifference.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionDifference.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionDifference.cpp 26 Apr 2002 06:25:23 -0000 1.7
+++ FunctionDifference.cpp 25 Nov 2002 19:07:13 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionDifference::FunctionDifference()
{
}
@@ -80,7 +84,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
if (args.size() != 2)
{
@@ -136,3 +140,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
difference() function accepts two arguments"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionDifference.hpp
Index: FunctionDifference.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionDifference.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionDifference.hpp 17 Apr 2002 05:34:20 -0000 1.3
+++ FunctionDifference.hpp 25 Nov 2002 19:07:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "difference" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionDifference&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionDistinct.cpp 26 Apr 2002 06:25:23 -0000 1.9
+++ FunctionDistinct.cpp 25 Nov 2002 19:07:13 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionDistinct::FunctionDistinct()
{
}
@@ -92,7 +96,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
if (args.size() != 1)
{
@@ -173,3 +177,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
distinct() function accepts one argument"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionDistinct.hpp
Index: FunctionDistinct.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionDistinct.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionDistinct.hpp 17 Apr 2002 05:34:20 -0000 1.3
+++ FunctionDistinct.hpp 25 Nov 2002 19:07:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "difference" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionDistinct&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionEvaluate.cpp
Index: FunctionEvaluate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionEvaluate.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionEvaluate.cpp 31 Oct 2002 07:10:25 -0000 1.7
+++ FunctionEvaluate.cpp 25 Nov 2002 19:07:13 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionEvaluate::FunctionEvaluate()
{
}
@@ -141,7 +145,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
if (args.size() != 1)
{
@@ -201,3 +205,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
evaluate() function accepts one argument"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionEvaluate.hpp
Index: FunctionEvaluate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionEvaluate.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionEvaluate.hpp 17 Apr 2002 05:34:20 -0000 1.3
+++ FunctionEvaluate.hpp 25 Nov 2002 19:07:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "node-set" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionEvaluate&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionHasSameNodes.cpp
Index: FunctionHasSameNodes.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionHasSameNodes.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionHasSameNodes.cpp 17 Apr 2002 05:34:20 -0000 1.6
+++ FunctionHasSameNodes.cpp 25 Nov 2002 19:07:13 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionHasSameNodes::FunctionHasSameNodes()
{
}
@@ -80,7 +84,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
if (args.size() != 2)
{
@@ -136,3 +140,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
has-same-nodes() function accepts two arguments"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionHasSameNodes.hpp
Index: FunctionHasSameNodes.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionHasSameNodes.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionHasSameNodes.hpp 17 Apr 2002 05:34:20 -0000 1.3
+++ FunctionHasSameNodes.hpp 25 Nov 2002 19:07:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "has-same-nodes" function for NodeSets.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionHasSameNodes&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionIntersection.cpp
Index: FunctionIntersection.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionIntersection.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionIntersection.cpp 26 Apr 2002 06:25:23 -0000 1.7
+++ FunctionIntersection.cpp 25 Nov 2002 19:07:13 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionIntersection::FunctionIntersection()
{
}
@@ -80,7 +84,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
if (args.size() != 2)
{
@@ -133,3 +137,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
intersection() function accepts two arguments"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionIntersection.hpp
Index: FunctionIntersection.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionIntersection.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionIntersection.hpp 17 Apr 2002 05:34:20 -0000 1.3
+++ FunctionIntersection.hpp 25 Nov 2002 19:07:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "intersection" function for NodeSets.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionIntersection&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionNodeSet.cpp 12 Aug 2002 03:58:38 -0000 1.10
+++ FunctionNodeSet.cpp 25 Nov 2002 19:07:13 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class ResultTreeFragBaseXNodeSetBaseProxy : public XNodeSetBase
{
public:
@@ -152,7 +156,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
if (args.size() != 1)
{
@@ -206,3 +210,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Invalid
argument type in function nodeset()"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2 xml-xalan/c/src/XalanExtensions/FunctionNodeSet.hpp
Index: FunctionNodeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionNodeSet.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionNodeSet.hpp 26 Apr 2002 06:25:23 -0000 1.5
+++ FunctionNodeSet.hpp 25 Nov 2002 19:07:13 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "node-set" function.
*/
@@ -97,7 +101,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -127,6 +131,10 @@
// Data members...
const bool m_convertString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XalanExtensions/XalanExtensions.cpp
Index: XalanExtensions.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/XalanExtensions.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanExtensions.cpp 16 Aug 2002 19:31:17 -0000 1.4
+++ XalanExtensions.cpp 25 Nov 2002 19:07:13 -0000 1.5
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMChar s_extensionsNamespace[] =
{
XalanUnicode::charLetter_h,
@@ -355,3 +359,7 @@
XPathEnvSupportDefault::uninstallExternalFunctionGlobal(theNamespaceString,
theFunctionName);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XalanExtensions/XalanExtensions.hpp
Index: XalanExtensions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/XalanExtensions.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanExtensions.hpp 26 Apr 2002 06:25:23 -0000 1.2
+++ XalanExtensions.hpp 25 Nov 2002 19:07:13 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class Function;
class XPathEnvSupportDefault;
@@ -119,6 +123,10 @@
const XalanDOMChar* theNamespace,
const FunctionTableEntry theFunctionTable[]);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +1 -1
xml-xalan/c/src/XalanExtensions/XalanExtensionsDefinitions.hpp
Index: XalanExtensionsDefinitions.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanExtensions/XalanExtensionsDefinitions.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanExtensionsDefinitions.hpp 14 Jun 2001 19:31:32 -0000 1.1
+++ XalanExtensionsDefinitions.hpp 25 Nov 2002 19:07:13 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
