amassari 2003/12/02 06:33:13
Modified: c/src/xercesc/sax2 DefaultHandler.hpp
c/src/xercesc/dom/impl DOMErrorImpl.cpp DOMErrorImpl.hpp
c/src/xercesc/com XMLDOMDocument.cpp XMLDOMDocument.h
Log:
Don't use the word "exception" as a variable name, as VC 7.1 complains about it
Revision Changes Path
1.6 +11 -8 xml-xerces/c/src/xercesc/sax2/DefaultHandler.hpp
Index: DefaultHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/DefaultHandler.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultHandler.hpp 4 Nov 2002 14:55:45 -0000 1.5
+++ DefaultHandler.hpp 2 Dec 2003 14:33:13 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/12/02 14:33:13 amassari
+ * Don't use the word "exception" as a variable name, as VC 7.1 complains about it
+ *
* Revision 1.5 2002/11/04 14:55:45 tng
* C++ Namespace Support.
*
@@ -412,13 +415,13 @@
* for each error, such as inserting the message in a log file or
* printing it to the console.</p>
*
- * @param exception The warning information encoded as an exception.
+ * @param exc The warning information encoded as an exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see ErrorHandler#warning
* @see SAXParseException#SAXParseException
*/
- virtual void error(const SAXParseException& exception);
+ virtual void error(const SAXParseException& exc);
/**
* Report a fatal XML parsing error.
@@ -431,13 +434,13 @@
* method is invoked, since the document is no longer reliable, and
* the parser may no longer report parsing events.</p>
*
- * @param exception The error information encoded as an exception.
+ * @param exc The error information encoded as an exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see ErrorHandler#fatalError
* @see SAXParseException#SAXParseException
*/
- virtual void fatalError(const SAXParseException& exception);
+ virtual void fatalError(const SAXParseException& exc);
/**
* Receive notification of a parser warning.
@@ -447,13 +450,13 @@
* for each warning, such as inserting the message in a log file or
* printing it to the console.</p>
*
- * @param exception The warning information encoded as an exception.
+ * @param exc The warning information encoded as an exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see ErrorHandler#warning
* @see SAXParseException#SAXParseException
*/
- virtual void warning(const SAXParseException& exception);
+ virtual void warning(const SAXParseException& exc);
/**
* Reset the Error handler object on its reuse
@@ -732,9 +735,9 @@
{
}
-inline void DefaultHandler::fatalError(const SAXParseException& exception)
+inline void DefaultHandler::fatalError(const SAXParseException& exc)
{
- throw exception;
+ throw exc;
}
inline void
1.7 +4 -1 xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.cpp
Index: DOMErrorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOMErrorImpl.cpp 4 Sep 2003 14:38:25 -0000 1.6
+++ DOMErrorImpl.cpp 2 Dec 2003 14:33:13 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/12/02 14:33:13 amassari
+ * Don't use the word "exception" as a variable name, as VC 7.1 complains about it
+ *
* Revision 1.6 2003/09/04 14:38:25 gareth
* Fix for bug #22008. Removed the ability to adopt the DOMObject.
*
@@ -139,7 +142,7 @@
fLocation = location;
}
-void DOMErrorImpl::setRelatedException(void* exception) const
+void DOMErrorImpl::setRelatedException(void* exc) const
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
}
1.9 +5 -2 xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.hpp
Index: DOMErrorImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DOMErrorImpl.hpp 4 Sep 2003 14:38:25 -0000 1.8
+++ DOMErrorImpl.hpp 2 Dec 2003 14:33:13 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2003/12/02 14:33:13 amassari
+ * Don't use the word "exception" as a variable name, as VC 7.1 complains about it
+ *
* Revision 1.8 2003/09/04 14:38:25 gareth
* Fix for bug #22008. Removed the ability to adopt the DOMObject.
*
@@ -209,11 +212,11 @@
*
* <p><b>"Experimental - subject to change"</b></p>
*
- * @param exception the related exception to set.
+ * @param exc the related exception to set.
* @see getRelatedException
* @since DOM Level 3
*/
- virtual void setRelatedException(void* exception) const;
+ virtual void setRelatedException(void* exc) const;
virtual void setType(const XMLCh* type);
1.4 +12 -12 xml-xerces/c/src/xercesc/com/XMLDOMDocument.cpp
Index: XMLDOMDocument.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocument.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDOMDocument.cpp 21 Oct 2003 21:24:37 -0000 1.3
+++ XMLDOMDocument.cpp 2 Dec 2003 14:33:13 -0000 1.4
@@ -178,31 +178,31 @@
DestroyWindow();
}
-void CXMLDOMDocument::warning(const SAXParseException& exception)
+void CXMLDOMDocument::warning(const SAXParseException& exc)
{
// ignore warnings
}
-void CXMLDOMDocument::error(const SAXParseException& exception)
+void CXMLDOMDocument::error(const SAXParseException& exc)
{
m_pParseError->SetData(1,
- exception.getSystemId(),
- exception.getMessage(),
+ exc.getSystemId(),
+ exc.getMessage(),
_T(""),
- exception.getLineNumber(),
- exception.getColumnNumber(),
+ exc.getLineNumber(),
+ exc.getColumnNumber(),
0);
m_bParseError = true;
}
-void CXMLDOMDocument::fatalError(const SAXParseException& exception)
+void CXMLDOMDocument::fatalError(const SAXParseException& exc)
{
m_pParseError->SetData(1,
- exception.getSystemId(),
- exception.getMessage(),
+ exc.getSystemId(),
+ exc.getMessage(),
_T(""),
- exception.getLineNumber(),
- exception.getColumnNumber(),
+ exc.getLineNumber(),
+ exc.getColumnNumber(),
0);
m_bParseError = true;
}
1.6 +6 -3 xml-xerces/c/src/xercesc/com/XMLDOMDocument.h
Index: XMLDOMDocument.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocument.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLDOMDocument.h 21 Nov 2003 12:05:48 -0000 1.5
+++ XMLDOMDocument.h 2 Dec 2003 14:33:13 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/12/02 14:33:13 amassari
+ * Don't use the word "exception" as a variable name, as VC 7.1 complains about it
+ *
* Revision 1.5 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -206,9 +209,9 @@
STDMETHOD(put_ontransformnode)(VARIANT newVal);
// Error handling
- virtual void warning(const SAXParseException& exception);
- virtual void error(const SAXParseException& exception);
- virtual void fatalError(const SAXParseException& exception);
+ virtual void warning(const SAXParseException& exc);
+ virtual void error(const SAXParseException& exc);
+ virtual void fatalError(const SAXParseException& exc);
bool IsAbort() const { return m_bAbort; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
