tng 2002/11/04 06:56:26
Modified: c/src/xercesc/sax AttributeList.hpp DTDHandler.hpp
DocumentHandler.hpp Dummy.cpp EntityResolver.hpp
ErrorHandler.hpp HandlerBase.hpp InputSource.cpp
InputSource.hpp Locator.hpp Parser.hpp
SAXException.cpp SAXException.hpp
SAXParseException.cpp SAXParseException.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.2 +25 -18 xml-xerces/c/src/xercesc/sax/AttributeList.hpp
Index: AttributeList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/AttributeList.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttributeList.hpp 1 Feb 2002 22:22:07 -0000 1.1
+++ AttributeList.hpp 4 Nov 2002 14:56:25 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:07 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:07 peiyongz
+ * sane_include
*
* Revision 1.8 2000/03/02 19:54:34 roddey
* This checkin includes many changes done while waiting for the
@@ -96,6 +99,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Interface for an element's attribute specifications.
*
@@ -140,10 +145,10 @@
* }
* </pre>
*
- * The AttributeListImpl helper class provides a convenience
+ * The AttributeListImpl helper class provides a convenience
* implementation for use by parser or application writers.
*
- * @see DocumentHandler#startElement
+ * @see DocumentHandler#startElement
* @see AttributeListImpl#AttributeListImpl
*/
@@ -176,7 +181,7 @@
* declared or specified. The number of attributes may be
* zero.
*
- * @return The number of attributes in the list.
+ * @return The number of attributes in the list.
*/
virtual unsigned int getLength() const = 0;
@@ -194,7 +199,7 @@
* @param index The index of the attribute in the list (starting at 0).
* @return The name of the indexed attribute, or null
* if the index is out of range.
- * @see #getLength
+ * @see #getLength
*/
virtual const XMLCh* getName(const unsigned int index) const = 0;
@@ -216,7 +221,7 @@
* @param index The index of the attribute in the list (starting at 0).
* @return The attribute type as a string, or
* null if the index is out of range.
- * @see #getLength
+ * @see #getLength
* @see #getType(String)
*/
virtual const XMLCh* getType(const unsigned int index) const = 0;
@@ -294,7 +299,9 @@
AttributeList(const AttributeList&);
/* Assignment operator */
void operator=(const AttributeList&);
-
+
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +9 -0 xml-xerces/c/src/xercesc/sax/DTDHandler.hpp
Index: DTDHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/DTDHandler.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DTDHandler.hpp 20 Feb 2002 18:17:01 -0000 1.2
+++ DTDHandler.hpp 4 Nov 2002 14:56:25 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -86,6 +89,10 @@
#ifndef DTDHANDLER_HPP
#define DTDHANDLER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Receive notification of basic DTD-related events.
*
@@ -213,5 +220,7 @@
void operator=(const DTDHandler&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +25 -18 xml-xerces/c/src/xercesc/sax/DocumentHandler.hpp
Index: DocumentHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/DocumentHandler.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentHandler.hpp 1 Feb 2002 22:22:08 -0000 1.1
+++ DocumentHandler.hpp 4 Nov 2002 14:56:25 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.6 2000/03/02 19:54:34 roddey
* This checkin includes many changes done while waiting for the
@@ -90,6 +93,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class AttributeList;
class Locator;
@@ -97,9 +102,9 @@
* Receive notification of general document events.
*
* <p>This is the main interface that most SAX applications
- * implement: if the application needs to be informed of basic parsing
- * events, it implements this interface and registers an instance with
- * the SAX parser using the setDocumentHandler method. The parser
+ * implement: if the application needs to be informed of basic parsing
+ * events, it implements this interface and registers an instance with
+ * the SAX parser using the setDocumentHandler method. The parser
* uses the instance to report basic document-related events like
* the start and end of elements and character data.</p>
*
@@ -138,7 +143,7 @@
//@}
/** @name The virtual document handler interface */
-
+
//@{
/**
* Receive notification of character data.
@@ -161,7 +166,7 @@
* @param length The number of characters to read from the array.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #ignorableWhitespace
+ * @see #ignorableWhitespace
* @see Locator#Locator
*/
virtual void characters
@@ -324,7 +329,7 @@
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see #endElement
- * @see AttributeList#AttributeList
+ * @see AttributeList#AttributeList
*/
virtual void startElement
(
@@ -341,5 +346,7 @@
/** Assignment operator */
void operator=(const DocumentHandler&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +18 -12 xml-xerces/c/src/xercesc/sax/Dummy.cpp
Index: Dummy.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/Dummy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Dummy.cpp 1 Feb 2002 22:22:08 -0000 1.1
+++ Dummy.cpp 4 Nov 2002 14:56:25 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:54:34 roddey
* This checkin includes many changes done while waiting for the
@@ -87,3 +90,6 @@
#include <xercesc/sax/Parser.hpp>
#include <xercesc/sax/SAXException.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
1.3 +7 -0 xml-xerces/c/src/xercesc/sax/EntityResolver.hpp
Index: EntityResolver.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/EntityResolver.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntityResolver.hpp 6 Jun 2002 20:39:16 -0000 1.2
+++ EntityResolver.hpp 4 Nov 2002 14:56:25 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/06/06 20:39:16 tng
* Document Fix: document that the returned object from resolveEntity is owned by
the parser
*
@@ -93,6 +96,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
/**
@@ -226,5 +231,7 @@
void operator=(const EntityResolver&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +26 -19 xml-xerces/c/src/xercesc/sax/ErrorHandler.hpp
Index: ErrorHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/ErrorHandler.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorHandler.hpp 1 Feb 2002 22:22:08 -0000 1.1
+++ ErrorHandler.hpp 4 Nov 2002 14:56:25 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.6 2000/04/27 19:33:15 rahulj
* Included <util/XercesDefs.hpp> as suggested by David N Bertoni.
@@ -88,6 +91,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class SAXParseException;
@@ -115,7 +120,7 @@
* itself.</p>
*
* @see Parser#setErrorHandler
- * @see SAXParseException#SAXParseException
+ * @see SAXParseException#SAXParseException
* @see HandlerBase#HandlerBase
*/
@@ -152,7 +157,7 @@
* SAX parse exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see SAXParseException#SAXParseException
+ * @see SAXParseException#SAXParseException
*/
virtual void warning(const SAXParseException& exception) = 0;
@@ -176,7 +181,7 @@
* SAX parse exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see SAXParseException#SAXParseException
+ * @see SAXParseException#SAXParseException
*/
virtual void error(const SAXParseException& exception) = 0;
@@ -195,13 +200,13 @@
* other events once this method has been invoked.</p>
*
* @param exception The error information encapsulated in a
- * SAX parse exception.
+ * SAX parse exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see SAXParseException#SAXParseException
*/
virtual void fatalError(const SAXParseException& exception) = 0;
-
+
/**
* Reset the Error handler object on its reuse
*
@@ -216,13 +221,15 @@
private :
/* Unimplemented constructors and operators */
-
+
/* Copy constructor */
ErrorHandler(const ErrorHandler&);
/* Assignment operator */
void operator=(const ErrorHandler&);
-
+
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.5 +7 -0 xml-xerces/c/src/xercesc/sax/HandlerBase.hpp
Index: HandlerBase.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/HandlerBase.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HandlerBase.hpp 16 Jul 2002 18:15:00 -0000 1.4
+++ HandlerBase.hpp 4 Nov 2002 14:56:25 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/07/16 18:15:00 tng
* [Bug 6070] warning unused variable in HandlerBase.hpp
*
@@ -103,6 +106,8 @@
#include <xercesc/sax/ErrorHandler.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class Locator;
class AttributeList;
@@ -523,5 +528,7 @@
inline void HandlerBase::warning(const SAXParseException&)
{
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +7 -1 xml-xerces/c/src/xercesc/sax/InputSource.cpp
Index: InputSource.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/InputSource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputSource.cpp 1 Feb 2002 22:22:08 -0000 1.1
+++ InputSource.cpp 4 Nov 2002 14:56:26 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.5 2001/11/21 16:14:32 tng
* Schema: New method InputSource::get/setIssueFatalErrorIfNotFound to tell the
parser whether to issue fatal error or not if cannot find it (the InputSource). This
is required for schema processing as it shouldn't be a fatal error if the schema is
not found.
@@ -89,7 +92,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/sax/InputSource.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// InputSource: Destructor
@@ -176,3 +179,6 @@
, fFatalErrorIfNotFound(true)
{
}
+
+XERCES_CPP_NAMESPACE_END
+
1.4 +7 -0 xml-xerces/c/src/xercesc/sax/InputSource.hpp
Index: InputSource.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/InputSource.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InputSource.hpp 30 Sep 2002 18:26:18 -0000 1.3
+++ InputSource.hpp 4 Nov 2002 14:56:26 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/30 18:26:18 tng
* Since the derived class Wrapper4DOMInputSource has overwritten the
set/getEncoding, SystemId, PublicId ... etc., these functions has to be virtual for
them to work.
*
@@ -109,6 +112,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
@@ -394,5 +399,7 @@
{
fFatalErrorIfNotFound = flag;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +8 -0 xml-xerces/c/src/xercesc/sax/Locator.hpp
Index: Locator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/Locator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Locator.hpp 27 May 2002 18:33:07 -0000 1.2
+++ Locator.hpp 4 Nov 2002 14:56:26 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:33:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column
number.
*
@@ -92,6 +95,9 @@
#define LOCATOR_HPP
#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Interface for associating a SAX event with a document location.
*
@@ -185,5 +191,7 @@
/* Assignment operator */
void operator=(const Locator&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +9 -0 xml-xerces/c/src/xercesc/sax/Parser.hpp
Index: Parser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/Parser.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Parser.hpp 11 Jul 2002 18:29:09 -0000 1.2
+++ Parser.hpp 4 Nov 2002 14:56:26 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/11 18:29:09 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -96,6 +99,10 @@
#ifndef PARSER_HPP
#define PARSER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class DTDHandler;
class EntityResolver;
class DocumentHandler;
@@ -309,5 +316,7 @@
/* The assignment operator, you cannot call this directly */
void operator=(const Parser&);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.2 +20 -12 xml-xerces/c/src/xercesc/sax/SAXException.cpp
Index: SAXException.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/SAXException.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAXException.cpp 1 Feb 2002 22:22:08 -0000 1.1
+++ SAXException.cpp 4 Nov 2002 14:56:26 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.1 2000/08/09 22:06:04 jpolast
* more functionality to SAXException and its children.
@@ -69,6 +72,8 @@
#include "SAXException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
// SAXNotSupportedException Constructors
SAXNotSupportedException::SAXNotSupportedException()
@@ -111,3 +116,6 @@
: SAXException(toCopy)
{
}
+
+XERCES_CPP_NAMESPACE_END
+
1.2 +20 -13 xml-xerces/c/src/xercesc/sax/SAXException.hpp
Index: SAXException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/SAXException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAXException.hpp 1 Feb 2002 22:22:08 -0000 1.1
+++ SAXException.hpp 4 Nov 2002 14:56:26 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.8 2000/09/07 23:55:02 andyh
* Fix SAXException assignment operator. Now non-virtual, and
@@ -99,6 +102,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUni.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Encapsulate a general SAX error or warning.
@@ -124,7 +129,7 @@
public:
/** @name Constructors and Destructor */
//@{
- /** Default constructor
+ /** Default constructor
*/
SAXException() :
@@ -269,5 +274,7 @@
*/
SAXNotRecognizedException(const SAXException& toCopy);
};
+
+XERCES_CPP_NAMESPACE_END
#endif
1.3 +7 -0 xml-xerces/c/src/xercesc/sax/SAXParseException.cpp
Index: SAXParseException.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/SAXParseException.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAXParseException.cpp 27 May 2002 18:33:07 -0000 1.2
+++ SAXParseException.cpp 4 Nov 2002 14:56:26 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:33:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column
number.
*
@@ -90,6 +93,7 @@
#include <xercesc/sax/Locator.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SAXParseException: Constructors and Destructor
@@ -181,3 +185,6 @@
{
return fColumnNumber;
}
+
+XERCES_CPP_NAMESPACE_END
+
1.3 +7 -0 xml-xerces/c/src/xercesc/sax/SAXParseException.hpp
Index: SAXParseException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/SAXParseException.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAXParseException.hpp 27 May 2002 18:33:07 -0000 1.2
+++ SAXParseException.hpp 4 Nov 2002 14:56:26 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:33:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column
number.
*
@@ -88,6 +91,8 @@
#include <xercesc/sax/SAXException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class Locator;
/**
@@ -235,5 +240,7 @@
};
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
