You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/01/06 22:39:44 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/common MixedContentModel.hpp
amassari 2005/01/06 13:39:44
Modified: c/src/xercesc/dom/impl DOMConfigurationImpl.cpp
DOMDocumentImpl.hpp
c/src/xercesc/framework/psvi PSVIHandler.hpp
c/src/xercesc/internal SGXMLScanner.cpp WFXMLScanner.cpp
XMLGrammarPoolImpl.cpp XMLScanner.hpp
XSAXMLScanner.cpp XSObjectFactory.cpp
c/src/xercesc/parsers AbstractDOMParser.cpp
SAX2XMLFilterImpl.hpp
c/src/xercesc/sax2 SAX2XMLReader.hpp
c/src/xercesc/util XMLUri.cpp XMemory.cpp
c/src/xercesc/util/MsgLoaders/Win32 Win32MsgLoader.cpp
c/src/xercesc/util/NetAccessors/WinSock
BinHTTPURLInputStream.cpp BinHTTPURLInputStream.hpp
c/src/xercesc/util/Platforms/Win32 Win32PlatformUtils.cpp
c/src/xercesc/util/Transcoders/Win32 Win32TransService.cpp
c/src/xercesc/validators/common MixedContentModel.hpp
Log:
Removed warnings
Revision Changes Path
1.10 +3 -3 xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
Index: DOMConfigurationImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMConfigurationImpl.cpp 8 Sep 2004 13:55:51 -0000 1.9
+++ DOMConfigurationImpl.cpp 6 Jan 2005 21:39:43 -0000 1.10
@@ -103,7 +103,7 @@
DOMConfigurationFeature whichFlag;
try {
whichFlag = getFeatureFlag(lowerCaseName);
- } catch(DOMException e) {
+ } catch(DOMException&) {
// must not be a boolean parameter
isBooleanParameter = false;
}
@@ -143,7 +143,7 @@
DOMConfigurationFeature whichFlag;
try {
whichFlag = getFeatureFlag(lowerCaseName);
- } catch (DOMException e) {
+ } catch (DOMException&) {
// must not be a boolean parameter
isBooleanParameter = false;
}
@@ -196,7 +196,7 @@
try {
whichFlag = getFeatureFlag(lowerCaseName);
booleanValue = *((bool*)value);
- } catch (DOMException e) {
+ } catch (DOMException&) {
// must not be a boolean parameter
isBooleanParameter = false;
}
1.26 +3 -3 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp
Index: DOMDocumentImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DOMDocumentImpl.hpp 8 Sep 2004 13:55:51 -0000 1.25
+++ DOMDocumentImpl.hpp 6 Jan 2005 21:39:43 -0000 1.26
@@ -385,11 +385,11 @@
// no matching operator delete found; memory will not be freed if initialization throws an exception
// ---------------------------------------------------------------------------
#if _MSC_VER >= 1200 /* VC++ 6.0 */
-inline void operator delete(void* ptr, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc)
+inline void operator delete(void* /*ptr*/, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * /*doc*/)
{
return;
}
-inline void operator delete(void* ptr, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentImpl::NodeObjectType type)
+inline void operator delete(void* /*ptr*/, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * /*doc*/, XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentImpl::NodeObjectType /*type*/)
{
return;
}
1.11 +11 -2 xml-xerces/c/src/xercesc/framework/psvi/PSVIHandler.hpp
Index: PSVIHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/PSVIHandler.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PSVIHandler.hpp 23 Sep 2004 21:22:15 -0000 1.10
+++ PSVIHandler.hpp 6 Jan 2005 21:39:43 -0000 1.11
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.11 2005/01/06 21:39:43 amassari
+ * Removed warnings
+ *
* Revision 1.10 2004/09/23 21:22:15 peiyongz
* Documentation
*
@@ -122,8 +125,7 @@
const XMLCh* const localName
, const XMLCh* const uri
, PSVIElement * elementInfo
- )
- { }
+ );
/**
* Enables PSVI information about attributes to be passed back to the
@@ -164,6 +166,13 @@
PSVIHandler(const PSVIHandler&);
PSVIHandler& operator=(const PSVIHandler&);
};
+
+inline void PSVIHandler::handlePartialElementPSVI(const XMLCh* const /*localName*/
+ , const XMLCh* const /*uri*/
+ , PSVIElement * /*elementInfo*/
+ )
+{
+}
XERCES_CPP_NAMESPACE_END
1.105 +1 -6 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- SGXMLScanner.cpp 3 Jan 2005 11:41:16 -0000 1.104
+++ SGXMLScanner.cpp 6 Jan 2005 21:39:43 -0000 1.105
@@ -872,7 +872,6 @@
// Make sure that its the end of the element that we expect
XMLCh *elemName = fElemStack.getCurrentSchemaElemName();
const ElemStack::StackElem* topElem = fElemStack.popTop();
- XMLElementDecl *tempElement = topElem->fThisElement;
if (!fReaderMgr.skippedString(elemName))
{
emitError
@@ -2379,9 +2378,6 @@
if (tempDV && tempDV->getWSFacet() != DatatypeValidator::PRESERVE)
{
// normalize the attribute according to schema whitespace facet
- XMLBufBid bbtemp(&fBufMgr);
- XMLBuffer& tempBuf = bbtemp.getBuffer();
-
((SchemaValidator*) fValidator)->normalizeWhiteSpace(tempDV, xsNormalized, fWSNormalizeBuf);
xsNormalized = fWSNormalizeBuf.getRawBuffer();
if (fNormalizeData && fValidate) {
@@ -3194,7 +3190,6 @@
// should not be necessary once PSVI method on element decls
// are removed
- const ElemStack::StackElem *topElem = fElemStack.topElement();
if (charOpts == XMLElementDecl::NoCharData)
{
// They definitely cannot handle any type of char data
1.27 +3 -3 xml-xerces/c/src/xercesc/internal/WFXMLScanner.cpp
Index: WFXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/WFXMLScanner.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WFXMLScanner.cpp 3 Dec 2004 19:40:30 -0000 1.26
+++ WFXMLScanner.cpp 6 Jan 2005 21:39:43 -0000 1.27
@@ -2053,8 +2053,8 @@
sendCharData(toUse);
}
-InputSource* WFXMLScanner::resolveSystemId(const XMLCh* const
- ,const XMLCh* const pubId)
+InputSource* WFXMLScanner::resolveSystemId(const XMLCh* const /*sysId*/
+ ,const XMLCh* const /*pubId*/)
{
return 0;
}
1.26 +5 -2 xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.cpp
Index: XMLGrammarPoolImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XMLGrammarPoolImpl.cpp 9 Nov 2004 03:09:21 -0000 1.25
+++ XMLGrammarPoolImpl.cpp 6 Jan 2005 21:39:43 -0000 1.26
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.26 2005/01/06 21:39:43 amassari
+ * Removed warnings
+ *
* Revision 1.25 2004/11/09 03:09:21 peiyongz
* Storer_NewerThan_Loader
*
@@ -391,7 +394,7 @@
//version information
unsigned int StorerLevel;
serEng>>StorerLevel;
- serEng.fStorerLevel = StorerLevel;
+ serEng.fStorerLevel = (short)StorerLevel;
//if the storer level is after the loader level
//the loader shall not read the data any more
1.48 +5 -2 xml-xerces/c/src/xercesc/internal/XMLScanner.hpp
Index: XMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.hpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- XMLScanner.hpp 14 Dec 2004 16:16:36 -0000 1.47
+++ XMLScanner.hpp 6 Jan 2005 21:39:43 -0000 1.48
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.48 2005/01/06 21:39:43 amassari
+ * Removed warnings
+ *
* Revision 1.47 2004/12/14 16:16:36 cargilld
* Fix for xercesc-684: Add accessor to XMLScanner to get the current grammar type.
*
@@ -746,8 +749,8 @@
virtual void sendCharData(XMLBuffer& toSend) = 0;
//return owned by the caller
- virtual InputSource* resolveSystemId(const XMLCh* const sysId
- ,const XMLCh* const pubId) {return 0;};
+ virtual InputSource* resolveSystemId(const XMLCh* const /*sysId*/
+ ,const XMLCh* const /*pubId*/) {return 0;};
// -----------------------------------------------------------------------
// Protected scanning methods
1.4 +1 -2 xml-xerces/c/src/xercesc/internal/XSAXMLScanner.cpp
Index: XSAXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSAXMLScanner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSAXMLScanner.cpp 23 Dec 2004 14:21:27 -0000 1.3
+++ XSAXMLScanner.cpp 6 Jan 2005 21:39:43 -0000 1.4
@@ -77,7 +77,6 @@
// Make sure that its the end of the element that we expect
XMLCh *elemName = fElemStack.getCurrentSchemaElemName();
const ElemStack::StackElem* topElem = fElemStack.popTop();
- XMLElementDecl *tempElement = topElem->fThisElement;
if (!fReaderMgr.skippedString(elemName))
{
emitError
1.24 +4 -1 xml-xerces/c/src/xercesc/internal/XSObjectFactory.cpp
Index: XSObjectFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSObjectFactory.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XSObjectFactory.cpp 8 Sep 2004 13:56:14 -0000 1.23
+++ XSObjectFactory.cpp 6 Jan 2005 21:39:43 -0000 1.24
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.24 2005/01/06 21:39:43 amassari
+ * Removed warnings
+ *
* Revision 1.23 2004/09/08 13:56:14 peiyongz
* Apache License Version 2.0
*
@@ -584,7 +587,7 @@
(typeInfo->getDatatypeValidator()))
xsSimpleType = addOrFind(typeInfo->getDatatypeValidator(), xsModel);
- unsigned int attCount;
+ unsigned int attCount=0;
if (typeInfo->hasAttDefs())
{
SchemaAttDefList& attDefList = (SchemaAttDefList&) typeInfo->getAttDefList();
1.69 +6 -6 xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp
Index: AbstractDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- AbstractDOMParser.cpp 28 Sep 2004 02:14:13 -0000 1.68
+++ AbstractDOMParser.cpp 6 Jan 2005 21:39:44 -0000 1.69
@@ -788,15 +788,15 @@
fWithinElement = false;
}
-void AbstractDOMParser::elementTypeInfo( const XMLCh * const typeName
- , const XMLCh *const typeURI)
+void AbstractDOMParser::elementTypeInfo( const XMLCh * const /*typeName*/
+ , const XMLCh * const /*typeURI*/)
{
}
-void AbstractDOMParser::ignorableWhitespace(const XMLCh* const chars
- , const unsigned int length
- , const bool)
+void AbstractDOMParser::ignorableWhitespace( const XMLCh* const chars
+ , const unsigned int length
+ , const bool)
{
// Ignore chars before the root element
if (!fWithinElement || !fIncludeIgnorableWhitespace)
1.2 +8 -5 xml-xerces/c/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
Index: SAX2XMLFilterImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLFilterImpl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAX2XMLFilterImpl.hpp 24 Dec 2004 19:21:46 -0000 1.1
+++ SAX2XMLFilterImpl.hpp 6 Jan 2005 21:39:44 -0000 1.2
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.2 2005/01/06 21:39:44 amassari
+ * Removed warnings
+ *
* Revision 1.1 2004/12/24 19:21:46 amassari
* Add support for SAX2 filters (jira# 1133)
*
@@ -1428,19 +1431,19 @@
fEntityResolver = resolver;
}
-inline void SAX2XMLFilterImpl::setLexicalHandler(LexicalHandler* const handler)
+inline void SAX2XMLFilterImpl::setLexicalHandler(LexicalHandler* const /*handler*/)
{
}
-inline void SAX2XMLFilterImpl::setDeclarationHandler(DeclHandler* const handler)
+inline void SAX2XMLFilterImpl::setDeclarationHandler(DeclHandler* const /*handler*/)
{
}
-inline void SAX2XMLFilterImpl::installAdvDocHandler(XMLDocumentHandler* const toInstall)
+inline void SAX2XMLFilterImpl::installAdvDocHandler(XMLDocumentHandler* const /*toInstall*/)
{
}
-inline bool SAX2XMLFilterImpl::removeAdvDocHandler(XMLDocumentHandler* const toRemove)
+inline bool SAX2XMLFilterImpl::removeAdvDocHandler(XMLDocumentHandler* const /*toRemove*/)
{
return false;
}
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SAX2XMLReader.hpp 10 Dec 2004 10:52:16 -0000 1.13
+++ SAX2XMLReader.hpp 6 Jan 2005 21:39:44 -0000 1.14
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.14 2005/01/06 21:39:44 amassari
+ * Removed warnings
+ *
* Revision 1.13 2004/12/10 10:52:16 cargilld
* Make setInputBufferSize virtual. Fix from Christian Will.
*
@@ -939,7 +942,7 @@
*
* @param bufferSize The maximum input buffer size
*/
- virtual void setInputBufferSize(const size_t bufferSize) {};
+ virtual void setInputBufferSize(const size_t bufferSize);
//@}
@@ -985,6 +988,10 @@
SAX2XMLReader& operator=(const SAX2XMLReader&);
};
+
+inline void SAX2XMLReader::setInputBufferSize(const size_t /*bufferSize*/)
+{
+}
XERCES_CPP_NAMESPACE_END
1.29 +2 -2 xml-xerces/c/src/xercesc/util/XMLUri.cpp
Index: XMLUri.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUri.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XMLUri.cpp 7 Dec 2004 09:04:04 -0000 1.28
+++ XMLUri.cpp 6 Jan 2005 21:39:44 -0000 1.29
@@ -855,7 +855,7 @@
int index = 0;
int start = 0;
int end = XMLString::stringLen(uriSpec);
- XMLCh testChar;
+ XMLCh testChar = 0;
// path - everything up to query string or fragment
if (start < end)
1.12 +3 -3 xml-xerces/c/src/xercesc/util/XMemory.cpp
Index: XMemory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMemory.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMemory.cpp 8 Sep 2004 13:56:25 -0000 1.11
+++ XMemory.cpp 6 Jan 2005 21:39:44 -0000 1.12
@@ -45,12 +45,12 @@
#if defined(XML_VISUALCPP)
-void* XMemory::operator new(size_t size, const char* file, int line)
+void* XMemory::operator new(size_t size, const char* /*file*/, int /*line*/)
{
return operator new(size);
}
-void XMemory::operator delete(void* p, const char* file, int line)
+void XMemory::operator delete(void* p, const char* /*file*/, int /*line*/)
{
operator delete(p);
}
1.13 +2 -2 xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
Index: Win32MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Win32MsgLoader.cpp 8 Sep 2004 13:56:34 -0000 1.12
+++ Win32MsgLoader.cpp 6 Jan 2005 21:39:44 -0000 1.13
@@ -44,7 +44,7 @@
BOOL APIENTRY DllMain(HINSTANCE hModule,
DWORD ul_reason_for_call,
- LPVOID lpReserved)
+ LPVOID /*lpReserved*/)
{
switch (ul_reason_for_call) {
case DLL_PROCESS_ATTACH:
1.10 +7 -4 xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
Index: BinHTTPURLInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BinHTTPURLInputStream.cpp 8 Sep 2004 13:56:36 -0000 1.9
+++ BinHTTPURLInputStream.cpp 6 Jan 2005 21:39:44 -0000 1.10
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.10 2005/01/06 21:39:44 amassari
+ * Removed warnings
+ *
* Revision 1.9 2004/09/08 13:56:36 peiyongz
* Apache License Version 2.0
*
@@ -231,22 +234,22 @@
return (*gWShtons)(hostshort);
}
-unsigned short BinHTTPURLInputStream::socket(int af,int type,int protocol)
+unsigned int BinHTTPURLInputStream::socket(int af,int type,int protocol)
{
return (*gWSsocket)(af,type,protocol);
}
-int BinHTTPURLInputStream::connect(unsigned short s,const sockaddr* name,int namelen)
+int BinHTTPURLInputStream::connect(unsigned int s,const sockaddr* name,int namelen)
{
return (*gWSconnect)(s,name,namelen);
}
-int BinHTTPURLInputStream::send(unsigned short s,const char* buf,int len,int flags)
+int BinHTTPURLInputStream::send(unsigned int s,const char* buf,int len,int flags)
{
return (*gWSsend)(s,buf,len,flags);
}
-int BinHTTPURLInputStream::recv(unsigned short s,char* buf,int len,int flags)
+int BinHTTPURLInputStream::recv(unsigned int s,char* buf,int len,int flags)
{
return (*gWSrecv)(s,buf,len,flags);
}
1.7 +7 -4 xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
Index: BinHTTPURLInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BinHTTPURLInputStream.hpp 8 Sep 2004 13:56:36 -0000 1.6
+++ BinHTTPURLInputStream.hpp 6 Jan 2005 21:39:44 -0000 1.7
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.7 2005/01/06 21:39:44 amassari
+ * Removed warnings
+ *
* Revision 1.6 2004/09/08 13:56:36 peiyongz
* Apache License Version 2.0
*
@@ -137,10 +140,10 @@
inline static unsigned long inet_addr(const char* cp);
inline static hostent* gethostbyaddr(const char* addr,int len,int type);
inline static unsigned short htons(unsigned short hostshort);
- inline static unsigned short socket(int af,int type,int protocol);
- inline static int connect(unsigned short s,const sockaddr* name,int namelen);
- inline static int send(unsigned short s,const char* buf,int len,int flags);
- inline static int recv(unsigned short s,char* buf,int len,int flags);
+ inline static unsigned int socket(int af,int type,int protocol);
+ inline static int connect(unsigned int s,const sockaddr* name,int namelen);
+ inline static int send(unsigned int s,const char* buf,int len,int flags);
+ inline static int recv(unsigned int s,char* buf,int len,int flags);
inline static int shutdown(unsigned int s,int how);
inline static int closesocket(unsigned int socket);
};
1.27 +4 -6 xml-xerces/c/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
Index: Win32PlatformUtils.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Win32PlatformUtils.cpp 15 Nov 2004 13:30:40 -0000 1.26
+++ Win32PlatformUtils.cpp 6 Jan 2005 21:39:44 -0000 1.27
@@ -158,7 +158,7 @@
}
FileHandle XMLPlatformUtils::openFile(const char* const fileName
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
FileHandle retVal = ::CreateFileA
(
@@ -305,7 +305,7 @@
}
FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
FileHandle retVal = ::CreateFileA
(
@@ -500,8 +500,6 @@
else
return;
}
-
- return;
}
void XMLPlatformUtils::resetFile(FileHandle theFile
@@ -558,7 +556,7 @@
}
bool XMLPlatformUtils::isRelative(const XMLCh* const toCheck
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
// Check for pathological case of empty path
if (!toCheck[0])
1.24 +7 -7 xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
Index: Win32TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Win32TransService.cpp 14 Sep 2004 20:33:39 -0000 1.23
+++ Win32TransService.cpp 6 Jan 2005 21:39:44 -0000 1.24
@@ -605,7 +605,7 @@
// If we are looking at a leading byte of a multibyte sequence,
// then we are going to eat 2 bytes, else 1.
//
- const unsigned int toEat = ::IsDBCSLeadByteEx(fWinCP, *inPtr) ?
+ unsigned char toEat = ::IsDBCSLeadByteEx(fWinCP, *inPtr) ?
2 : 1;
// Make sure a whol char is in the source
@@ -745,7 +745,7 @@
if (toCheck & 0xFFFF0000)
{
srcBuf[0] = XMLCh((toCheck >> 10) + 0xD800);
- srcBuf[1] = XMLCh(toCheck & 0x3FF) + 0xDC00;
+ srcBuf[1] = XMLCh((toCheck & 0x3FF) + 0xDC00);
srcCount++;
}
else
@@ -803,7 +803,7 @@
// Win32LCPTranscoder: Implementation of the virtual transcoder interface
// ---------------------------------------------------------------------------
unsigned int Win32LCPTranscoder::calcRequiredSize(const char* const srcText
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
if (!srcText)
return 0;
@@ -813,7 +813,7 @@
unsigned int Win32LCPTranscoder::calcRequiredSize(const XMLCh* const srcText
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
if (!srcText)
return 0;
@@ -947,7 +947,7 @@
bool Win32LCPTranscoder::transcode( const char* const toTranscode
, XMLCh* const toFill
, const unsigned int maxChars
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
// Check for a couple of psycho corner cases
if (!toTranscode || !maxChars)
@@ -972,7 +972,7 @@
bool Win32LCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
, const unsigned int maxBytes
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
// Watch for a couple of pyscho corner cases
if (!toTranscode || !maxBytes)
1.10 +4 -1 xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp
Index: MixedContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MixedContentModel.hpp 16 Sep 2004 13:32:04 -0000 1.9
+++ MixedContentModel.hpp 6 Jan 2005 21:39:44 -0000 1.10
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.10 2005/01/06 21:39:44 amassari
+ * Removed warnings
+ *
* Revision 1.9 2004/09/16 13:32:04 amassari
* Updated error message for UPA to also state the complex type that is failing the test
*
@@ -242,7 +245,7 @@
, XMLStringPool* const
, XMLValidator* const
, unsigned int* const pContentSpecOrgURI
- , const XMLCh* pComplexTypeName /*= 0*/
+ , const XMLCh* /*pComplexTypeName*/ /*= 0*/
)
{
// rename back
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org