diff --git a/src/xercesc/dom/DOMElement.hpp b/src/xercesc/dom/DOMElement.hpp index a743f1030b480b753603de810de9c401c3dd5327..e65133e045cc993484fd24d46c5ad0318f86c0d4 100644 --- a/src/xercesc/dom/DOMElement.hpp +++ b/src/xercesc/dom/DOMElement.hpp @@ -401,8 +401,8 @@ public: * @param name The name of the <code>DOMAttr</code>. * @param isId Whether the attribute is of type ID. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. - * <br />NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> + * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.<br> + * NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> * of this element. * * @since DOM Level 3 @@ -423,8 +423,8 @@ public: * @param localName The local name of the <code>DOMAttr</code>. * @param isId Whether the attribute is of type ID. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. - * <br />NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> of this element. + * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.<br> + * NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> of this element. * * @since DOM Level 3 */ @@ -444,8 +444,8 @@ public: * @param idAttr The <code>DOMAttr</code> node. * @param isId Whether the attribute is of type ID. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. - * <br />NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> of this element. + * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.<br> + * NOT_FOUND_ERR: Raised if the specified node is not an <code>DOMAttr</code> of this element. * * @since DOM Level 3 */ diff --git a/src/xercesc/dom/DOMLSParser.hpp b/src/xercesc/dom/DOMLSParser.hpp index ce625ec59f0e8eea6e769c28dff31e234a1073ba..ef0c15e2fcfc4805d6b51e341cd12d5fb394dfdd 100644 --- a/src/xercesc/dom/DOMLSParser.hpp +++ b/src/xercesc/dom/DOMLSParser.hpp @@ -242,10 +242,12 @@ public: * * "http://apache.org/xml/properties/scannerName" * A string holding the type of scanner used while parsing. The valid names are: + * <ul> * <li>IGXMLScanner: the default one, capable of both XMLSchema and DTD validation</li> * <li>SGXMLScanner: a scanner that can only perform XMLSchema validation</li> * <li>DGXMLScanner: a scanner that can only perform DTD validation</li> * <li>WFXMLScanner: a scanner that cannot perform any type validation, only well-formedness</li> + * </ul> * * "http://apache.org/xml/properties/parser-use-DOMDocument-from-Implementation" * A string holding the capabilities of the DOM implementation to be used to create the DOMDocument @@ -510,7 +512,7 @@ public: virtual DOMDocument* parseURI(const char* const uri) = 0; /** - * Parse an XML fragment from a resource identified by a <code>DOMLSInput<code> + * Parse an XML fragment from a resource identified by a <code>DOMLSInput</code> * and insert the content into an existing document at the position specified * with the context and action arguments. When parsing the input stream, the * context node (or its parent, depending on where the result will be inserted) @@ -546,7 +548,7 @@ public: * (internal subset), entity declaration(s), notation declaration(s), * or XML or text declaration(s). * @param contextNode The node that is used as the context for the data that is being - * parsed. This node must be a <code>DOMDocument<code> node, a + * parsed. This node must be a <code>DOMDocument</code> node, a * <code>DOMDocumentFragment</code> node, or a node of a type that * is allowed as a child of an <code>DOMElement</code> node, e.g. * it cannot be an <code>DOMAttribute</code> node. diff --git a/src/xercesc/dom/DOMLSSerializer.hpp b/src/xercesc/dom/DOMLSSerializer.hpp index 2f4088afd278b6b8cded779c516cc8ec55fe5283..d1d82a89faa0f2e9470a8b4734db25092d2dc9bc 100644 --- a/src/xercesc/dom/DOMLSSerializer.hpp +++ b/src/xercesc/dom/DOMLSSerializer.hpp @@ -383,13 +383,13 @@ public: * sequence that matches one of those allowed by 2.11 "End-of-Line * Handling". </dd> * <dt>CR</dt> - * <dd>The carriage-return character (#xD).</dd> + * <dd>The carriage-return character (\#xD).</dd> * <dt>CR-LF</dt> * <dd> The - * carriage-return and line-feed characters (#xD #xA). </dd> + * carriage-return and line-feed characters (\#xD \#xA). </dd> * <dt>LF</dt> * <dd> The line-feed - * character (#xA). </dd> + * character (\#xA). </dd> * </dl> * <br>The default value for this attribute is <code>null</code>. * diff --git a/src/xercesc/dom/DOMLocator.hpp b/src/xercesc/dom/DOMLocator.hpp index 1af4be1bc49da33d6522d42fc05268be64b09ee8..d0552de97ce93ccfc0a1d72965522a31b8d9e9b2 100644 --- a/src/xercesc/dom/DOMLocator.hpp +++ b/src/xercesc/dom/DOMLocator.hpp @@ -121,7 +121,6 @@ public: * Get the URI where the error occured, or <code>null</code> if there is no * URI available. * - * @see #setURI * @since DOM Level 3 */ virtual const XMLCh* getURI() const = 0; diff --git a/src/xercesc/dom/DOMNode.hpp b/src/xercesc/dom/DOMNode.hpp index 39ddb990bce426d61b294d747cb49c18bab5a6ad..6a3f21d09607120598d8f116117928719d9009ad 100644 --- a/src/xercesc/dom/DOMNode.hpp +++ b/src/xercesc/dom/DOMNode.hpp @@ -66,25 +66,25 @@ class DOMUserDataHandler; * </tr> * <tr> * <td valign='top' rowspan='1' colspan='1'>DOMCDATASection</td> - * <td valign='top' rowspan='1' colspan='1'>"#cdata-section"</td> + * <td valign='top' rowspan='1' colspan='1'>"\#cdata-section"</td> * <td valign='top' rowspan='1' colspan='1'>content of the CDATA Section</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * </tr> * <tr> * <td valign='top' rowspan='1' colspan='1'>DOMComment</td> - * <td valign='top' rowspan='1' colspan='1'>"#comment"</td> + * <td valign='top' rowspan='1' colspan='1'>"\#comment"</td> * <td valign='top' rowspan='1' colspan='1'>content of the comment</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * </tr> * <tr> * <td valign='top' rowspan='1' colspan='1'>DOMDocument</td> - * <td valign='top' rowspan='1' colspan='1'>"#document"</td> + * <td valign='top' rowspan='1' colspan='1'>"\#document"</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * </tr> * <tr> * <td valign='top' rowspan='1' colspan='1'>DOMDocumentFragment</td> - * <td valign='top' rowspan='1' colspan='1'>"#document-fragment"</td> + * <td valign='top' rowspan='1' colspan='1'>"\#document-fragment"</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * </tr> @@ -126,7 +126,7 @@ class DOMUserDataHandler; * </tr> * <tr> * <td valign='top' rowspan='1' colspan='1'>DOMText</td> - * <td valign='top' rowspan='1' colspan='1'>"#text"</td> + * <td valign='top' rowspan='1' colspan='1'>"\#text"</td> * <td valign='top' rowspan='1' colspan='1'>content of the text node</td> * <td valign='top' rowspan='1' colspan='1'>null</td> * </tr> @@ -774,7 +774,7 @@ public: * DOMSTRING_SIZE_ERR: Raised when it would return more characters than * fit in a <code>DOMString</code> variable on the implementation * platform. - * @see #setTextContext + * @see #setTextContent * @since DOM Level 3 */ virtual const XMLCh* getTextContent() const = 0; @@ -787,7 +787,7 @@ public: * * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. - * @see #getTextContext + * @see #getTextContent * @since DOM Level 3 */ virtual void setTextContent(const XMLCh* textContent) = 0; @@ -833,6 +833,7 @@ public: * This method makes available a <code>DOMNode</code>'s specialized interface * * @param feature The name of the feature requested (case-insensitive). + * @param version The version of the feature requested. * @return Returns an alternate <code>DOMNode</code> which implements the * specialized APIs of the specified feature, if any, or * <code>null</code> if there is no alternate <code>DOMNode</code> which diff --git a/src/xercesc/framework/Wrapper4DOMLSInput.hpp b/src/xercesc/framework/Wrapper4DOMLSInput.hpp index cae9f740086d9a7a223c9d0ce103346391981670..b2dfbd7348b7e0c7a33fc22517b6c8b2ec6fd1af 100644 --- a/src/xercesc/framework/Wrapper4DOMLSInput.hpp +++ b/src/xercesc/framework/Wrapper4DOMLSInput.hpp @@ -45,6 +45,7 @@ public: * By default, the wrapper will adopt the DOMLSInput that is wrapped. * * @param inputSource The DOMLSInput to be wrapped + * @param entityResolver The DOMLSResourceResolver to be used when resolving publicID entries * @param adoptFlag Indicates if the wrapper should adopt the wrapped * DOMLSInput. Default is true. * @param manager Pointer to the memory manager to be used to diff --git a/src/xercesc/framework/XMLAttDef.hpp b/src/xercesc/framework/XMLAttDef.hpp index 3b47116d12f5087e1fd61f4121c6bd5d3eac6b6e..42eb75d576c99e07db721da05c6a5a31702cabe2 100644 --- a/src/xercesc/framework/XMLAttDef.hpp +++ b/src/xercesc/framework/XMLAttDef.hpp @@ -207,7 +207,7 @@ public: * * This method returns the 'default type' of the attribute. Default * type in this case refers to the XML concept of a default type for - * an attribute, i.e. #FIXED, #IMPLIED, etc... + * an attribute, i.e. \#FIXED, \#IMPLIED, etc... * * @return The default type enum for this attribute type. */ diff --git a/src/xercesc/framework/XMLDocumentHandler.hpp b/src/xercesc/framework/XMLDocumentHandler.hpp index 59661bd11c52a540c36d38689424150a63a7acd3..0804efa5493694e11eb6251b757c6ab2427a6cb5 100644 --- a/src/xercesc/framework/XMLDocumentHandler.hpp +++ b/src/xercesc/framework/XMLDocumentHandler.hpp @@ -171,7 +171,7 @@ public: * @param length The number of characters to read from the array. * @param cdataSection Indicates that this data is inside a CDATA * section. - * @see #characters + * @see #docCharacters */ virtual void ignorableWhitespace ( @@ -278,9 +278,9 @@ public: */ virtual void elementTypeInfo ( - const XMLCh* const /* typeName */ - , const XMLCh* const /* typeURI */ - ) { /* non pure virtual to permit backward compatibility of implementations. */ }; + const XMLCh* const typeName + , const XMLCh* const typeURI + ); //@} @@ -302,6 +302,11 @@ private: XMLDocumentHandler& operator=(const XMLDocumentHandler&); }; +inline void XMLDocumentHandler::elementTypeInfo(const XMLCh* const /*typeName*/, const XMLCh* const /*typeURI*/) +{ + /* non pure virtual to permit backward compatibility of implementations. */ +} + XERCES_CPP_NAMESPACE_END #endif diff --git a/src/xercesc/parsers/AbstractDOMParser.hpp b/src/xercesc/parsers/AbstractDOMParser.hpp index fba878d13399d0604d3597724102ce7efd947216..2f1858f528daa216d188e3ffe85699dec923c641 100644 --- a/src/xercesc/parsers/AbstractDOMParser.hpp +++ b/src/xercesc/parsers/AbstractDOMParser.hpp @@ -248,7 +248,7 @@ public : * set validation constraint errors as fatal, false * otherwise. * - * @see #setValidationContraintFatal + * @see #setValidationConstraintFatal */ bool getValidationConstraintFatal() const; @@ -330,7 +330,7 @@ public : * specified externally. A null pointer is returned if nothing * was specified externally. * - * @see #setSecurityManager(const SecurityManager* const) + * @see #setSecurityManager */ SecurityManager* getSecurityManager() const; @@ -848,7 +848,7 @@ public : * * @param newValue The state to set * - * @see #entityResolver + * @see #EntityResolver */ void setDisableDefaultEntityResolution(const bool newValue); diff --git a/src/xercesc/parsers/SAXParser.hpp b/src/xercesc/parsers/SAXParser.hpp index 76849b95f7622ff9a5c1df9fd756a3f02f549370..7a9c422573d1b3c761a69a57c7e7b5648a31a490 100644 --- a/src/xercesc/parsers/SAXParser.hpp +++ b/src/xercesc/parsers/SAXParser.hpp @@ -300,7 +300,7 @@ public : * set validation constraint errors as fatal, false * otherwise. * - * @see #setValidationContraintFatal + * @see #setValidationConstraintFatal */ bool getValidationConstraintFatal() const; @@ -359,7 +359,7 @@ public : * specified externally. A null pointer is returned if nothing * was specified externally. * - * @see #setSecurityManager(const SecurityManager* const) + * @see #setSecurityManager(SecurityManager* const) */ SecurityManager* getSecurityManager() const; @@ -881,7 +881,7 @@ public : * * @param newValue The state to set * - * @see #entityResolver + * @see #EntityResolver */ void setDisableDefaultEntityResolution(const bool newValue); diff --git a/src/xercesc/sax/AttributeList.hpp b/src/xercesc/sax/AttributeList.hpp index 69e696114c4681bf8e15cdd0fb26f160f6681a96..1892157074c21e272c004f8a8851646c9640c0ec 100644 --- a/src/xercesc/sax/AttributeList.hpp +++ b/src/xercesc/sax/AttributeList.hpp @@ -38,7 +38,7 @@ XERCES_CPP_NAMESPACE_BEGIN * helper class provides a convenient constructor for doing so). * * An AttributeList includes only attributes that have been - * specified or defaulted: #IMPLIED attributes will not be included. + * specified or defaulted: \#IMPLIED attributes will not be included. * * There are two ways for the SAX application to obtain information * from the AttributeList. First, it can iterate through the entire @@ -114,7 +114,7 @@ public: * * The names must be unique: the SAX parser shall not include the * same attribute twice. Attributes without values (those declared - * #IMPLIED without a value specified in the start tag) will be + * \#IMPLIED without a value specified in the start tag) will be * omitted from the list. * * If the attribute name has a namespace prefix, the prefix @@ -146,7 +146,7 @@ public: * @return The attribute type as a string, or * null if the index is out of range. * @see #getLength - * @see #getType(String) + * @see #getType */ virtual const XMLCh* getType(const unsigned int index) const = 0; @@ -161,8 +161,7 @@ public: * @return The attribute value as a string, or * null if the index is out of range. * @see #getLength - * @see #getValue(XMLCh*) - * @see #getValue(char *) + * @see #getValue */ virtual const XMLCh* getValue(const unsigned int index) const = 0; @@ -178,7 +177,7 @@ public: * @param name The name of the attribute. * @return The attribute type as a string, or null if no * such attribute exists. - * @see #getType(int) + * @see #getType */ virtual const XMLCh* getType(const XMLCh* const name) const = 0; @@ -194,8 +193,7 @@ public: * @param name The name of the attribute in the list. * @return The attribute value as a string, or null if * no such attribute exists. - * @see #getValue(int) - * @see #getValue(char *) + * @see #getValue */ virtual const XMLCh* getValue(const XMLCh* const name) const = 0; @@ -211,8 +209,7 @@ public: * @param name The name of the attribute in the list. * @return The attribute value as a string, or null if * no such attribute exists. - * @see #getValue(int) - * @see #getValue(XMLCh*) + * @see #getValue */ virtual const XMLCh* getValue(const char* const name) const = 0; //@} diff --git a/src/xercesc/sax/DocumentHandler.hpp b/src/xercesc/sax/DocumentHandler.hpp index 02bac9ad9af61ed8fa3810859f8999dae8276b7e..f15a150ceb3bc242111a26fe17d2462eb77807f1 100644 --- a/src/xercesc/sax/DocumentHandler.hpp +++ b/src/xercesc/sax/DocumentHandler.hpp @@ -253,7 +253,7 @@ public: * <p>If the element name has a namespace prefix, the prefix will * still be attached. Note that the attribute list provided will * contain only attributes with explicit values (specified or - * defaulted): #IMPLIED attributes will be omitted.</p> + * defaulted): \#IMPLIED attributes will be omitted.</p> * * @param name The element type name. * @param attrs The attributes attached to the element, if any. diff --git a/src/xercesc/sax/EntityResolver.hpp b/src/xercesc/sax/EntityResolver.hpp index 09f43e3e8224a7af86a12721d63275d9405ab45b..7ab869bbbcf3cee94a40b073b02f94a6044c7301 100644 --- a/src/xercesc/sax/EntityResolver.hpp +++ b/src/xercesc/sax/EntityResolver.hpp @@ -50,8 +50,8 @@ class InputSource; * identifier "http://www.myhost.com/today":</p> * *<code> - *#include <xercesc/sax/EntityResolver.hpp><br> - *#include <xercesc/sax/InputSource.hpp><br> + *\#include <xercesc/sax/EntityResolver.hpp><br> + *\#include <xercesc/sax/InputSource.hpp><br> *<br> *class MyResolver : public EntityResolver {<br> * public:<br> diff --git a/src/xercesc/sax/Parser.hpp b/src/xercesc/sax/Parser.hpp index 8ff312f6b39c70bc368da36e25158f3b6962a24f..ab291940a0d253781343cb48363bdd1166362241 100644 --- a/src/xercesc/sax/Parser.hpp +++ b/src/xercesc/sax/Parser.hpp @@ -198,7 +198,7 @@ public: * wrapping another exception. * @exception XMLException An exception from the parser or client * handler code. - * @see #parse(InputSource) + * @see #parse(const InputSource&) */ virtual void parse ( @@ -222,7 +222,7 @@ public: * wrapping another exception. * @exception XMLException An exception from the parser or client * handler code. - * @see #parse(InputSource) + * @see #parse(const InputSource&) */ virtual void parse ( diff --git a/src/xercesc/sax2/Attributes.hpp b/src/xercesc/sax2/Attributes.hpp index 6aef8aac4b068171292d02923ab10e6d57a5b0cf..88357a9186c2b0b3b984dbf3e691a4a7b6338e4a 100644 --- a/src/xercesc/sax2/Attributes.hpp +++ b/src/xercesc/sax2/Attributes.hpp @@ -38,7 +38,7 @@ XERCES_CPP_NAMESPACE_BEGIN * helper class provides a convenient constructor for doing so). * * An Attributes includes only attributes that have been - * specified or defaulted: #IMPLIED attributes will not be included. + * specified or defaulted: \#IMPLIED attributes will not be included. * * There are two ways for the SAX application to obtain information * from the Attributes. First, it can iterate through the entire @@ -116,7 +116,7 @@ public: * * The QNames must be unique: the SAX parser shall not include the * same attribute twice. Attributes without values (those declared - * #IMPLIED without a value specified in the start tag) will be + * \#IMPLIED without a value specified in the start tag) will be * omitted from the list. * * @param index The index of the attribute in the list (starting at 0). @@ -131,7 +131,7 @@ public: * * The QNames must be unique: the SAX parser shall not include the * same attribute twice. Attributes without values (those declared - * #IMPLIED without a value specified in the start tag) will be + * \#IMPLIED without a value specified in the start tag) will be * omitted from the list. * * @param index The index of the attribute in the list (starting at 0). @@ -146,7 +146,7 @@ public: * * The QNames must be unique: the SAX parser shall not include the * same attribute twice. Attributes without values (those declared - * #IMPLIED without a value specified in the start tag) will be + * \#IMPLIED without a value specified in the start tag) will be * omitted from the list. * * @param index The index of the attribute in the list (starting at 0). @@ -175,7 +175,7 @@ public: * @return The attribute type as a string, or * null if the index is out of range. * @see #getLength - * @see #getType(String) + * @see #getType */ virtual const XMLCh* getType(const unsigned int index) const = 0; @@ -190,7 +190,7 @@ public: * @return The attribute value as a string, or * null if the index is out of range. * @see #getLength - * @see #getValue(XMLCh*) + * @see #getValue */ virtual const XMLCh* getValue(const unsigned int index) const = 0; diff --git a/src/xercesc/sax2/ContentHandler.hpp b/src/xercesc/sax2/ContentHandler.hpp index 309883cd385419666bed17d00812adb37843b111..58636badf0ad40992755b0d58a0b6e7e1575fff8 100644 --- a/src/xercesc/sax2/ContentHandler.hpp +++ b/src/xercesc/sax2/ContentHandler.hpp @@ -247,9 +247,9 @@ public: * * <p>Note that the attribute list provided will * contain only attributes with explicit values (specified or - * defaulted): #IMPLIED attributes will be omitted.</p> + * defaulted): \#IMPLIED attributes will be omitted.</p> * - * @param uri The URI of the asscioated namespace for this element + * @param uri The URI of the associated namespace for this element * @param localname The local part of the element name * @param qname The QName of this element * @param attrs The attributes attached to the element, if any. diff --git a/src/xercesc/sax2/SAX2XMLReader.hpp b/src/xercesc/sax2/SAX2XMLReader.hpp index 6be4e679ae4df6a522cf0245e736fa3c6cc19544..ec88063fb9711b7b720f3efea0344840a48fa18f 100644 --- a/src/xercesc/sax2/SAX2XMLReader.hpp +++ b/src/xercesc/sax2/SAX2XMLReader.hpp @@ -52,7 +52,19 @@ public: * Val_Always: The parser will always report validation errors. * Val_Auto: The parser will report validation errors only if a grammar is specified. * - * @see #setValidationScheme + * The schemes map to these feature values: + * Val_Never: + * parser->setFeature(XMLUni::fgSAX2CoreValidation, false); + * + * Val_Always: + * parser->setFeature(XMLUni::fgSAX2CoreValidation, true); + * parser->setFeature(XMLUni::fgXercesDynamic, false); + * + * Val_Auto: + * parser->setFeature(XMLUni::fgSAX2CoreValidation, true); + * parser->setFeature(XMLUni::fgXercesDynamic, true); + * + * @see #setFeature */ enum ValSchemes { @@ -155,7 +167,7 @@ public: * handler immediately. * * @param handler The document handler. - * @see DocumentHandler#DocumentHandler + * @see ContentHandler#ContentHandler * @see HandlerBase#HandlerBase */ virtual void setContentHandler(ContentHandler* const handler) = 0; @@ -286,7 +298,7 @@ public: * @see InputSource#InputSource * @see #setEntityResolver * @see #setDTDHandler - * @see #setDocumentHandler + * @see #setContentHandler * @see #setErrorHandler */ virtual void parse @@ -311,7 +323,7 @@ public: * wrapping another exception. * @exception XMLException An exception from the parser or client * handler code. - * @see #parse(InputSource) + * @see #parse(const InputSource&) */ virtual void parse ( @@ -335,7 +347,7 @@ public: * wrapping another exception. * @exception XMLException An exception from the parser or client * handler code. - * @see #parse(InputSource) + * @see #parse(const InputSource&) */ virtual void parse ( @@ -456,7 +468,7 @@ public: * set validation constraint errors as fatal, false * otherwise. * - * @see #setValidationContraintFatal + * @see #setValidationConstraintFatal * @see #getFeature */ virtual bool getValidationConstraintFatal() const = 0; diff --git a/src/xercesc/util/PlatformUtils.hpp b/src/xercesc/util/PlatformUtils.hpp index 2437b653eb43da9e3334d2938d8a3ddb10995507..815273ac9a67a769a9e7885556487ef5329f7176 100644 --- a/src/xercesc/util/PlatformUtils.hpp +++ b/src/xercesc/util/PlatformUtils.hpp @@ -538,7 +538,7 @@ public : * * @param manager The MemoryManager to use to allocate objects */ - static XMLMutexMgr* makeMutexMgr(MemoryManager* const memmgr); + static XMLMutexMgr* makeMutexMgr(MemoryManager* const manager); /** Closes a mutex handle * @@ -546,6 +546,7 @@ public : * the actual content of the passed mutex handle is. * * @param mtxHandle The mutex handle that you want to close + * @param manager The MemoryManager used to allocate the object */ static void closeMutex(void* const mtxHandle, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); @@ -610,7 +611,7 @@ public : * * @param manager The MemoryManager to use to allocate objects */ - static XMLAtomicOpMgr* makeAtomicOpMgr(MemoryManager* const memmgr); + static XMLAtomicOpMgr* makeAtomicOpMgr(MemoryManager* const manager); /** Conditionally updates or returns a single word variable atomically diff --git a/src/xercesc/util/XMLEntityResolver.hpp b/src/xercesc/util/XMLEntityResolver.hpp index d5c5435778bf0b0f151ae5f2dce294b6f542305c..e889de594d55338285b0e66b37cb8fc6bb4c8303 100644 --- a/src/xercesc/util/XMLEntityResolver.hpp +++ b/src/xercesc/util/XMLEntityResolver.hpp @@ -58,8 +58,8 @@ class InputSource; * identifier "http://www.myhost.com/today":</p> * *<code> - * #include <xercesc/util/XMLEntityResolver.hpp><br> - * #include <xercesc/sax/InputSource.hpp><br> + * \#include <xercesc/util/XMLEntityResolver.hpp><br> + * \#include <xercesc/sax/InputSource.hpp><br> *<br> * class MyResolver : public XMLEntityResolver {<br> * public:<br> diff --git a/src/xercesc/util/XMLResourceIdentifier.hpp b/src/xercesc/util/XMLResourceIdentifier.hpp index 734548220223ab4640744335316a271c4590b643..280f607182e246c2a74af2984f2ac9857ee22dd9 100644 --- a/src/xercesc/util/XMLResourceIdentifier.hpp +++ b/src/xercesc/util/XMLResourceIdentifier.hpp @@ -64,8 +64,8 @@ class Locator; * identifier "http://www.myhost.com/today":</p> * *<code> - * #include <xercesc/util/XMLEntityResolver.hpp><br> - * #include <xercesc/sax/InputSource.hpp><br> + * \#include <xercesc/util/XMLEntityResolver.hpp><br> + * \#include <xercesc/sax/InputSource.hpp><br> *<br> * class MyResolver : public XMLEntityResolver {<br> * public:<br> diff --git a/src/xercesc/util/XMLString.hpp b/src/xercesc/util/XMLString.hpp index 3e9657ef67e8ecfead2b41e95943173210b53ebe..e923507066dff07580122f30cf27e8c75bef9591 100644 --- a/src/xercesc/util/XMLString.hpp +++ b/src/xercesc/util/XMLString.hpp @@ -1124,6 +1124,7 @@ public: * You can call XMLString::release to release this returned buffer. * * @param toTranscode The string to be transcoded + * @param manager The MemoryManager to use to allocate objects * @return Returns the transcoded string * @see XMLString::release(XMLCh**, MemoryManager*) */ @@ -1163,6 +1164,7 @@ public: * You can call XMLString::release to release this returned buffer. * * @param toTranscode The string to be transcoded + * @param manager The MemoryManager to use to allocate objects * @return Returns the transcoded string * @see XMLString::release(char**, MemoryManager*) */