You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/11/04 15:55:45 UTC

cvs commit: xml-xerces/c/src/xercesc/sax2 Attributes.hpp ContentHandler.hpp DeclHandler.hpp DefaultHandler.hpp LexicalHandler.hpp SAX2XMLReader.hpp XMLReaderFactory.hpp sax2Dummy.cpp

tng         2002/11/04 06:55:45

  Modified:    c/src/xercesc/sax2 Attributes.hpp ContentHandler.hpp
                        DeclHandler.hpp DefaultHandler.hpp
                        LexicalHandler.hpp SAX2XMLReader.hpp
                        XMLReaderFactory.hpp sax2Dummy.cpp
  Log:
  C++ Namespace Support.
  
  Revision  Changes    Path
  1.3       +7 -0      xml-xerces/c/src/xercesc/sax2/Attributes.hpp
  
  Index: Attributes.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/Attributes.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Attributes.hpp	20 Feb 2002 18:17:02 -0000	1.2
  +++ Attributes.hpp	4 Nov 2002 14:55:45 -0000	1.3
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.3  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
    * Revision 1.2  2002/02/20 18:17:02  tng
    * [Bug 5977] Warnings on generating apiDocs.
    *
  @@ -97,6 +100,8 @@
   
   #include <xercesc/util/XercesDefs.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
  +
   /**
     * Interface for an element's attribute specifications.
     *
  @@ -351,5 +356,7 @@
       void operator=(const Attributes&);
   
   };
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.2       +29 -22    xml-xerces/c/src/xercesc/sax2/ContentHandler.hpp
  
  Index: ContentHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/ContentHandler.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContentHandler.hpp	1 Feb 2002 22:22:09 -0000	1.1
  +++ ContentHandler.hpp	4 Nov 2002 14:55:45 -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:09  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:09  peiyongz
  + * sane_include
    *
    * Revision 1.4  2000/12/14 18:50:05  tng
    * Fix API document generation warning: "Warning: end of member group without matching begin"
  @@ -92,6 +95,8 @@
   
   #include <xercesc/util/XercesDefs.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
  +
   class Attributes;
   class Locator;
   
  @@ -99,9 +104,9 @@
     * Receive notification of general document events.
     *
     * <p>This is the main interface that most SAX2 applications
  -  * implement: if the application needs to be informed of basic parsing 
  -  * events, it implements this interface and registers an instance with 
  -  * the SAX2 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 SAX2 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>
     *
  @@ -140,7 +145,7 @@
       //@}
   
       /** @name The virtual document handler interface */
  -    
  +
       //@{
      /**
       * Receive notification of character data.
  @@ -163,7 +168,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
  @@ -202,8 +207,8 @@
       */
       virtual void endElement
   	(
  -		const XMLCh* const uri, 
  -		const XMLCh* const localname, 
  +		const XMLCh* const uri,
  +		const XMLCh* const localname,
   		const XMLCh* const qname
   	) = 0;
   
  @@ -345,7 +350,7 @@
       *            wrapping another exception.
       */
   	virtual void startPrefixMapping
  -	( 
  +	(
   		const	XMLCh* const	prefix,
   		const	XMLCh* const	uri
   	) = 0 ;
  @@ -381,8 +386,8 @@
       *
   	* <p>Introduced with SAX2</p>
   	*
  -    * @param name The name of the skipped entity.  If it is a parameter entity, 
  -	* the name will begin with %, and if it is the external DTD subset, 
  +    * @param name The name of the skipped entity.  If it is a parameter entity,
  +	* the name will begin with %, and if it is the external DTD subset,
   	* it will be the string [dtd].
       * @exception SAXException Any SAX exception, possibly
       *            wrapping another exception.
  @@ -400,5 +405,7 @@
       /** Assignment operator */
       void operator=(const ContentHandler&);
   };
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.2       +21 -15    xml-xerces/c/src/xercesc/sax2/DeclHandler.hpp
  
  Index: DeclHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/DeclHandler.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeclHandler.hpp	1 Feb 2002 22:22:09 -0000	1.1
  +++ DeclHandler.hpp	4 Nov 2002 14:55:45 -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:09  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:09  peiyongz
  + * sane_include
    *
    * Revision 1.1  2002/01/28 17:08:33  knoaman
    * SAX2-ext's DeclHandler support.
  @@ -70,6 +73,7 @@
   
   #include <xercesc/util/XercesDefs.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
   
   /**
     * Receive notification of DTD declaration events.
  @@ -107,7 +111,7 @@
       //@}
   
       /** @name The virtual declaration handler interface */
  -    
  +
       //@{
      /**
       * Report an element type declaration.
  @@ -144,7 +148,7 @@
       * @param aName The name of the attribute.
       * @param type A string representing the attribute type.
       * @param mode A string representing the attribute defaulting mode ("#IMPLIED", "#REQUIRED", or "#FIXED") or null if none of these applies.
  -    * @param value A string representing the attribute's default value, or null if there is none. 
  +    * @param value A string representing the attribute's default value, or null if there is none.
       * @exception SAXException Any SAX exception, possibly
       *            wrapping another exception.
       */
  @@ -160,7 +164,7 @@
      /**
       * Report an internal entity declaration.
       *
  -    * <p>Only the effective (first) declaration for each entity will be 
  +    * <p>Only the effective (first) declaration for each entity will be
       * reported. All parameter entities in the value will be expanded, but
       * general entities will not.</p>
       *
  @@ -202,5 +206,7 @@
       /** Assignment operator */
       void operator=(const DeclHandler&);
   };
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.5       +7 -0      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultHandler.hpp	20 Aug 2002 16:53:56 -0000	1.4
  +++ DefaultHandler.hpp	4 Nov 2002 14:55:45 -0000	1.5
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.5  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
    * Revision 1.4  2002/08/20 16:53:56  tng
    * [Bug 6251] Info during compilation.
    *
  @@ -103,6 +106,8 @@
   #include <xercesc/sax/ErrorHandler.hpp>
   #include <xercesc/sax/SAXParseException.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
  +
   class Locator;
   class Attributes;
   
  @@ -865,5 +870,7 @@
                                                  const XMLCh* const)
   {
   }
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif // ! DEFAULTHANDLER_HPP
  
  
  
  1.2       +19 -13    xml-xerces/c/src/xercesc/sax2/LexicalHandler.hpp
  
  Index: LexicalHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/LexicalHandler.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LexicalHandler.hpp	1 Feb 2002 22:22:09 -0000	1.1
  +++ LexicalHandler.hpp	4 Nov 2002 14:55:45 -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:09  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:09  peiyongz
  + * sane_include
    *
    * Revision 1.1  2000/12/22 15:17:04  tng
    * SAX2-ext's LexicalHandler support added by David Bertoni.
  @@ -71,6 +74,7 @@
   
   #include <xercesc/util/XercesDefs.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
   
   /**
     * Receive notification of lexical events.
  @@ -106,7 +110,7 @@
       //@}
   
       /** @name The virtual document handler interface */
  -    
  +
       //@{
      /**
       * Receive notification of comments.
  @@ -212,5 +216,7 @@
       /** Assignment operator */
       void operator=(const LexicalHandler&);
   };
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.7       +8 -1      xml-xerces/c/src/xercesc/sax2/SAX2XMLReader.hpp
  
  Index: SAX2XMLReader.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/SAX2XMLReader.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SAX2XMLReader.hpp	11 Jul 2002 18:29:09 -0000	1.6
  +++ SAX2XMLReader.hpp	4 Nov 2002 14:55:45 -0000	1.7
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
    * Revision 1.6  2002/07/11 18:29:09  knoaman
    * Grammar caching/preparsing - initial implementation.
    *
  @@ -156,6 +159,8 @@
   #include <xercesc/framework/XMLValidator.hpp>
   #include <xercesc/framework/XMLPScanToken.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
  +
   class ContentHandler ;
   class DTDHandler;
   class EntityResolver;
  @@ -609,7 +614,7 @@
         *
         * @param uriId id of the string in the URI string pool.
         * @return URI string corresponding to the URI id.
  -      */    
  +      */
       virtual const XMLCh* getURIText(unsigned int uriId) = 0;
   
       //@}
  @@ -982,5 +987,7 @@
       void operator=(const SAX2XMLReader&);
   
   };
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.3       +20 -13    xml-xerces/c/src/xercesc/sax2/XMLReaderFactory.hpp
  
  Index: XMLReaderFactory.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/XMLReaderFactory.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLReaderFactory.hpp	7 May 2002 17:45:52 -0000	1.2
  +++ XMLReaderFactory.hpp	4 Nov 2002 14:55:45 -0000	1.3
  @@ -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,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.3  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
    * Revision 1.2  2002/05/07 17:45:52  knoaman
    * SAX2 documentation update.
    *
  @@ -82,6 +85,8 @@
   #include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
   #include <xercesc/sax/SAXException.hpp>
   
  +XERCES_CPP_NAMESPACE_BEGIN
  +
   /**
     * Creates a SAX2 parser (SAX2XMLReader).
     *
  @@ -111,8 +116,10 @@
   inline SAX2XMLReader * XMLReaderFactory::createXMLReader(const XMLCh * className)
   {	
   	throw SAXNotSupportedException();
  -	// unimplemented 
  +	// unimplemented
   	return 0;
   }
  +
  +XERCES_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.2       +18 -12    xml-xerces/c/src/xercesc/sax2/sax2Dummy.cpp
  
  Index: sax2Dummy.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/sax2Dummy.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sax2Dummy.cpp	1 Feb 2002 22:22:09 -0000	1.1
  +++ sax2Dummy.cpp	4 Nov 2002 14:55:45 -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:09  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/11/04 14:55:45  tng
  + * C++ Namespace Support.
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:09  peiyongz
  + * sane_include
    *
    * Revision 1.1  2000/08/02 18:02:35  jpolast
    * initial checkin of sax2 implementation
  @@ -73,3 +76,6 @@
   #include <xercesc/sax2/ContentHandler.hpp>
   #include <xercesc/sax2/DefaultHandler.hpp>
   #include <xercesc/sax2/Attributes.hpp>
  +
  +XERCES_CPP_NAMESPACE_BEGIN
  +XERCES_CPP_NAMESPACE_END
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org