diff --git a/src/xercesc/framework/XMLElementDecl.hpp b/src/xercesc/framework/XMLElementDecl.hpp
index 114e20e478a4d508cc54c11e51b59e6e336c0468..844a99b3c5725995248d4772d4161f675868eefc 100644
--- a/src/xercesc/framework/XMLElementDecl.hpp
+++ b/src/xercesc/framework/XMLElementDecl.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/08/20 16:55:33 tng
+ * [Bug 6251] Info during compilation.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.18 2001/08/21 16:06:10 tng
* Schema: Unique Particle Attribution Constraint Checking.
@@ -327,7 +330,7 @@ class XMLPARSER_EXPORT XMLElementDecl
* object. Any previous object is destroyed.
*/
virtual void setContentSpec(ContentSpecNode* toAdopt) = 0;
-
+
/** Get a pointer to the abstract content model
*
* This method will return a const pointer to the content model object
@@ -339,8 +342,8 @@ class XMLPARSER_EXPORT XMLElementDecl
* @return A pointer to the element's content model, via the basic
* abstract content model type.
*/
- virtual XMLContentModel* getContentModel() = 0;
-
+ virtual XMLContentModel* getContentModel() = 0;
+
/** Set the content model object for this element type
*
* This method will adopt the based content model object. This is called
@@ -352,8 +355,8 @@ class XMLPARSER_EXPORT XMLElementDecl
* @param newModelToAdopt This method will adopt the passed content model
* object. Any previous object is destroyed.
*/
- virtual void setContentModel(XMLContentModel* const newModelToAdopt) = 0;
-
+ virtual void setContentModel(XMLContentModel* const newModelToAdopt) = 0;
+
/** Geta formatted string of the content model
*
* This method is a convenience method which will create a formatted
@@ -366,7 +369,7 @@ class XMLPARSER_EXPORT XMLElementDecl
* content model. The caller does not own this buffer and should
* copy it if it needs to be kept around.
*/
- virtual const XMLCh* getFormattedContentModel () const = 0;
+ virtual const XMLCh* getFormattedContentModel () const = 0;
//@}
@@ -394,7 +397,7 @@ class XMLPARSER_EXPORT XMLElementDecl
*
* @return The URI Id of the element decl, or the emptyNamespaceId if not applicable.
*/
- const unsigned int getURI() const;
+ unsigned int getURI() const;
/** Get the QName of this element type.
*
@@ -603,7 +606,7 @@ inline XMLCh* XMLElementDecl::getBaseName()
return fElementName->getLocalPart();
}
-inline const unsigned int XMLElementDecl::getURI() const
+inline unsigned int XMLElementDecl::getURI() const
{
return fElementName->getURI();
}
diff --git a/src/xercesc/framework/XMLValidator.hpp b/src/xercesc/framework/XMLValidator.hpp
index 10417300cdf5d2d8cbb27a646a9786195da94b50..9c2e86917857d0c827def385d3472b827e85f8d5 100644
--- a/src/xercesc/framework/XMLValidator.hpp
+++ b/src/xercesc/framework/XMLValidator.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/08/20 16:54:11 tng
+ * [Bug 6251] Info during compilation.
+ *
* Revision 1.3 2002/07/11 18:55:44 knoaman
* Add a flag to the preContentValidation method to indicate whether to validate
* default/fixed attributes or not.
@@ -432,7 +435,7 @@ public:
*/
bool checkRootElement
(
- const unsigned int elemId
+ const unsigned int
) { return true;};
// -----------------------------------------------------------------------
diff --git a/src/xercesc/sax2/DefaultHandler.hpp b/src/xercesc/sax2/DefaultHandler.hpp
index d02f246e6ed2149799205b4ca10419f02d316612..250b8a19e1a57e8aed009756ad016f79174525a1 100644
--- a/src/xercesc/sax2/DefaultHandler.hpp
+++ b/src/xercesc/sax2/DefaultHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/08/20 16:53:56 tng
+ * [Bug 6251] Info during compilation.
+ *
* Revision 1.3 2002/06/06 20:38:45 tng
* Document Fix: document that the returned object from resolveEntity is owned by the parser
*
@@ -705,8 +708,8 @@ public:
// ---------------------------------------------------------------------------
// HandlerBase: Inline default implementations
// ---------------------------------------------------------------------------
-inline void DefaultHandler::characters(const XMLCh* const chars
- ,const unsigned int length)
+inline void DefaultHandler::characters(const XMLCh* const
+ ,const unsigned int)
{
}
@@ -714,13 +717,13 @@ inline void DefaultHandler::endDocument()
{
}
-inline void DefaultHandler::endElement(const XMLCh* const uri
- , const XMLCh* const localname
- , const XMLCh* const qname)
+inline void DefaultHandler::endElement(const XMLCh* const
+ , const XMLCh* const
+ , const XMLCh* const)
{
}
-inline void DefaultHandler::error(const SAXParseException& exception)
+inline void DefaultHandler::error(const SAXParseException&)
{
}
@@ -730,20 +733,20 @@ inline void DefaultHandler::fatalError(const SAXParseException& exception)
}
inline void
-DefaultHandler::ignorableWhitespace( const XMLCh* const chars
- , const unsigned int length)
+DefaultHandler::ignorableWhitespace( const XMLCh* const
+ , const unsigned int)
{
}
-inline void DefaultHandler::notationDecl( const XMLCh* const name
- , const XMLCh* const publicId
- , const XMLCh* const systemId)
+inline void DefaultHandler::notationDecl( const XMLCh* const
+ , const XMLCh* const
+ , const XMLCh* const)
{
}
inline void
-DefaultHandler::processingInstruction( const XMLCh* const target
- , const XMLCh* const data)
+DefaultHandler::processingInstruction( const XMLCh* const
+ , const XMLCh* const)
{
}
@@ -760,21 +763,21 @@ inline void DefaultHandler::resetDocType()
}
inline InputSource*
-DefaultHandler::resolveEntity( const XMLCh* const publicId
- , const XMLCh* const systemId)
+DefaultHandler::resolveEntity( const XMLCh* const
+ , const XMLCh* const)
{
return 0;
}
inline void
-DefaultHandler::unparsedEntityDecl(const XMLCh* const name
- , const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const notationName)
+DefaultHandler::unparsedEntityDecl(const XMLCh* const
+ , const XMLCh* const
+ , const XMLCh* const
+ , const XMLCh* const)
{
}
-inline void DefaultHandler::setDocumentLocator(const Locator* const locator)
+inline void DefaultHandler::setDocumentLocator(const Locator* const)
{
}
@@ -783,33 +786,33 @@ inline void DefaultHandler::startDocument()
}
inline void
-DefaultHandler::startElement( const XMLCh* const uri
- , const XMLCh* const localname
- , const XMLCh* const qname
- , const Attributes& attrs
+DefaultHandler::startElement( const XMLCh* const
+ , const XMLCh* const
+ , const XMLCh* const
+ , const Attributes&
)
{
}
-inline void DefaultHandler::warning(const SAXParseException& exception)
+inline void DefaultHandler::warning(const SAXParseException&)
{
}
-inline void DefaultHandler::startPrefixMapping ( const XMLCh* const prefix
- ,const XMLCh* const uri)
+inline void DefaultHandler::startPrefixMapping ( const XMLCh* const
+ ,const XMLCh* const)
{
}
-inline void DefaultHandler::endPrefixMapping ( const XMLCh* const prefix )
+inline void DefaultHandler::endPrefixMapping ( const XMLCh* const)
{
}
-inline void DefaultHandler::skippedEntity ( const XMLCh* const name )
+inline void DefaultHandler::skippedEntity ( const XMLCh* const)
{
}
-inline void DefaultHandler::comment( const XMLCh* const chars
- , const unsigned int length)
+inline void DefaultHandler::comment( const XMLCh* const
+ , const unsigned int)
{
}
@@ -821,7 +824,7 @@ inline void DefaultHandler::endDTD ()
{
}
-inline void DefaultHandler::endEntity (const XMLCh* const name)
+inline void DefaultHandler::endEntity (const XMLCh* const)
{
}
@@ -829,13 +832,13 @@ inline void DefaultHandler::startCDATA ()
{
}
-inline void DefaultHandler::startDTD( const XMLCh* const name
- , const XMLCh* const publicId
- , const XMLCh* const systemId)
+inline void DefaultHandler::startDTD( const XMLCh* const
+ , const XMLCh* const
+ , const XMLCh* const)
{
}
-inline void DefaultHandler::startEntity (const XMLCh* const name)
+inline void DefaultHandler::startEntity (const XMLCh* const)
{
}
diff --git a/src/xercesc/util/QName.hpp b/src/xercesc/util/QName.hpp
index 3efc47fe0007a1f4e0d6667fdb0feeced3031247..571d650f7f5ce1b65afa6b98bc1851a383e8a202 100644
--- a/src/xercesc/util/QName.hpp
+++ b/src/xercesc/util/QName.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:11 peiyongz
- * Initial revision
+ * Revision 1.2 2002/08/20 16:54:25 tng
+ * [Bug 6251] Info during compilation.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:11 peiyongz
+ * sane_include
*
* Revision 1.8 2001/12/06 17:48:36 tng
* Performance Enhancement. Added setNPrefix and setNLocalPart methods that allow code to take advantage of the fact that it knows the length of the prefix and local name, when possible. That can avoid a copy of the prefix into a null-terminated temporary variable before copying into the fPrefix.
@@ -131,8 +134,7 @@ public :
const XMLCh* getLocalPart() const;
XMLCh* getLocalPart();
- const unsigned int getURI() const;
- unsigned int getURI();
+ unsigned int getURI() const;
const XMLCh* getRawName() const;
XMLCh* getRawName();
@@ -234,12 +236,7 @@ inline XMLCh* QName::getLocalPart()
return fLocalPart;
}
-inline const unsigned int QName::getURI() const
-{
- return fURIId;
-}
-
-inline unsigned int QName::getURI()
+inline unsigned int QName::getURI() const
{
return fURIId;
}