dbertoni 02/01/04 09:29:07
Modified: c/src/XPath FoundIndex.cpp FoundIndex.hpp XObject.cpp
XObject.hpp XPath.cpp
XPathExecutionContextDefault.cpp
XPathExpression.cpp XPathExpression.hpp
XPathFunctionTable.cpp XPathFunctionTable.hpp
XPathParserException.cpp XPathParserException.hpp
Log:
Changed XPathException to XalanXPathException because of a clash with a new
Xerces class of the same name.
Revision Changes Path
1.2 +2 -2 xml-xalan/c/src/XPath/FoundIndex.cpp
Index: FoundIndex.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FoundIndex.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FoundIndex.cpp 18 Dec 1999 19:47:54 -0000 1.1
+++ FoundIndex.cpp 4 Jan 2002 17:29:07 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
FoundIndex::FoundIndex() :
- XPathException()
+ XalanXPathException()
{
}
1.2 +3 -3 xml-xalan/c/src/XPath/FoundIndex.hpp
Index: FoundIndex.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FoundIndex.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FoundIndex.hpp 18 Dec 1999 19:47:54 -0000 1.1
+++ FoundIndex.hpp 4 Jan 2002 17:29:07 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,11 +64,11 @@
-#include <XPath/XPathException.hpp>
+#include <XPath/XalanXPathException.hpp>
-class XALAN_XPATH_EXPORT FoundIndex : public XPathException
+class XALAN_XPATH_EXPORT FoundIndex : public XalanXPathException
{
public:
1.28 +2 -2 xml-xalan/c/src/XPath/XObject.cpp
Index: XObject.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XObject.cpp 17 Nov 2001 00:12:59 -0000 1.27
+++ XObject.cpp 4 Jan 2002 17:29:07 -0000 1.28
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1098,7 +1098,7 @@
const XalanDOMString& message,
const XalanNode* styleNode,
const XalanDOMString& theType) :
- XPathException(message, styleNode, theType)
+ XalanXPathException(message, styleNode, theType)
{
}
1.22 +3 -3 xml-xalan/c/src/XPath/XObject.hpp
Index: XObject.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XObject.hpp 19 Oct 2001 18:37:47 -0000 1.21
+++ XObject.hpp 4 Jan 2002 17:29:07 -0000 1.22
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@
-#include <XPath/XPathException.hpp>
+#include <XPath/XalanXPathException.hpp>
@@ -312,7 +312,7 @@
}
// Base class for all XObject exceptions...
- class XObjectException : public XPathException
+ class XObjectException : public XalanXPathException
{
public:
1.67 +1 -2 xml-xalan/c/src/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- XPath.cpp 30 Nov 2001 22:11:21 -0000 1.66
+++ XPath.cpp 4 Jan 2002 17:29:07 -0000 1.67
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,6 @@
#include "MutableNodeRefList.hpp"
#include "XalanQNameByReference.hpp"
#include "XLocator.hpp"
-#include "XPathException.hpp"
#include "XObject.hpp"
#include "XObjectFactory.hpp"
#include "XPathEnvSupport.hpp"
1.48 +7 -7 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- XPathExecutionContextDefault.cpp 26 Nov 2001 23:14:15 -0000 1.47
+++ XPathExecutionContextDefault.cpp 4 Jan 2002 17:29:07 -0000 1.48
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -452,7 +452,7 @@
-1,
-1) == true)
{
- throw XPathException(msg, 0);
+ throw XalanXPathException(msg, 0);
}
}
@@ -504,7 +504,7 @@
lineNumber,
columnNumber) == true)
{
- throw XPathException(msg, uri, lineNumber, columnNumber);
+ throw XalanXPathException(msg, uri, lineNumber, columnNumber);
}
}
@@ -550,7 +550,7 @@
-1,
-1) == true)
{
- throw XPathException(msg, sourceNode);
+ throw XalanXPathException(msg, sourceNode);
}
}
@@ -602,7 +602,7 @@
lineNumber,
columnNumber) == true)
{
- throw XPathException(msg, uri, lineNumber, columnNumber);
+ throw XalanXPathException(msg, uri, lineNumber, columnNumber);
}
}
@@ -649,7 +649,7 @@
-1) == true)
{
// $$$ ToDo: Do something with the PrefixResolver here...
- throw XPathException(msg);
+ throw XalanXPathException(msg);
}
}
@@ -701,7 +701,7 @@
lineNumber,
columnNumber) == true)
{
- throw XPathException(msg, uri, lineNumber, columnNumber);
+ throw XalanXPathException(msg, uri, lineNumber, columnNumber);
}
}
1.33 +2 -2 xml-xalan/c/src/XPath/XPathExpression.cpp
Index: XPathExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExpression.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XPathExpression.cpp 8 Jul 2001 18:20:35 -0000 1.32
+++ XPathExpression.cpp 4 Jan 2002 17:29:07 -0000 1.33
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -195,7 +195,7 @@
XPathExpression::XPathExpressionException::XPathExpressionException(const
XalanDOMString& theMessage) :
- XPathException(theMessage)
+ XalanXPathException(theMessage)
{
}
1.25 +3 -3 xml-xalan/c/src/XPath/XPathExpression.hpp
Index: XPathExpression.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExpression.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XPathExpression.hpp 28 Sep 2001 18:27:36 -0000 1.24
+++ XPathExpression.hpp 4 Jan 2002 17:29:07 -0000 1.25
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@
#include <XPath/XToken.hpp>
-#include <XPath/XPathException.hpp>
+#include <XPath/XalanXPathException.hpp>
@@ -563,7 +563,7 @@
/**
* Exception class thrown when an invalid XPath expression is
encountered
*/
- class XALAN_XPATH_EXPORT XPathExpressionException : public
XPathException
+ class XALAN_XPATH_EXPORT XPathExpressionException : public
XalanXPathException
{
public:
1.16 +3 -3 xml-xalan/c/src/XPath/XPathFunctionTable.cpp
Index: XPathFunctionTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XPathFunctionTable.cpp 20 Sep 2001 18:05:34 -0000 1.15
+++ XPathFunctionTable.cpp 4 Jan 2002 17:29:07 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -309,7 +309,7 @@
XPathExceptionFunctionNotAvailable::XPathExceptionFunctionNotAvailable(
int theFunctionNumber,
const XalanNode* styleNode) :
- XPathException(TranscodeFromLocalCodePage("The specified function ID is
not available: ") + LongToDOMString(theFunctionNumber),
+ XalanXPathException(TranscodeFromLocalCodePage("The specified function
ID is not available: ") + LongToDOMString(theFunctionNumber),
styleNode)
{
}
@@ -319,7 +319,7 @@
XPathExceptionFunctionNotAvailable::XPathExceptionFunctionNotAvailable(
const XalanDOMString& theFunctionName,
const XalanNode* styleNode) :
- XPathException(TranscodeFromLocalCodePage("The specified function is
not available: ") + theFunctionName,
+ XalanXPathException(TranscodeFromLocalCodePage("The specified function
is not available: ") + theFunctionName,
styleNode)
{
}
1.14 +3 -3 xml-xalan/c/src/XPath/XPathFunctionTable.hpp
Index: XPathFunctionTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XPathFunctionTable.hpp 14 Sep 2001 20:06:26 -0000 1.13
+++ XPathFunctionTable.hpp 4 Jan 2002 17:29:07 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,14 +78,14 @@
#include <XPath/Function.hpp>
-#include <XPath/XPathException.hpp>
+#include <XPath/XalanXPathException.hpp>
/**
* Exception class thrown when an unknown function is encountered
*/
-class XALAN_XPATH_EXPORT XPathExceptionFunctionNotAvailable : public
XPathException
+class XALAN_XPATH_EXPORT XPathExceptionFunctionNotAvailable : public
XalanXPathException
{
public:
1.5 +4 -4 xml-xalan/c/src/XPath/XPathParserException.cpp
Index: XPathParserException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathParserException.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPathParserException.cpp 19 Dec 2001 22:02:27 -0000 1.4
+++ XPathParserException.cpp 4 Jan 2002 17:29:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
int
theLineNumber,
int
theColumnNumber,
const XalanDOMString& theType) :
- XPathException(message, theURI, theLineNumber, theColumnNumber, 0,
theType)
+ XalanXPathException(message, theURI, theLineNumber, theColumnNumber, 0,
theType)
{
}
@@ -76,7 +76,7 @@
const Locator& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType) :
- XPathException(theLocator, theMessage, 0, theType)
+ XalanXPathException(theLocator, theMessage, 0, theType)
{
}
@@ -85,7 +85,7 @@
XPathParserException::XPathParserException(
const XalanDOMString& message,
const XalanDOMString& theType) :
- XPathException(message, 0, theType)
+ XalanXPathException(message, 0, theType)
{
}
1.6 +3 -3 xml-xalan/c/src/XPath/XPathParserException.hpp
Index: XPathParserException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathParserException.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathParserException.hpp 19 Dec 2001 22:02:27 -0000 1.5
+++ XPathParserException.hpp 4 Jan 2002 17:29:07 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,14 +64,14 @@
-#include <XPath/XPathException.hpp>
+#include <XPath/XalanXPathException.hpp>
/**
* Exception class thrown when a problem parsing an XPath is encountered
*/
-class XALAN_XPATH_EXPORT XPathParserException : public XPathException
+class XALAN_XPATH_EXPORT XPathParserException : public XalanXPathException
{
public:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
