amassari 2005/01/07 07:12:11
Modified: c/src/xercesc/util BaseRefVectorOf.c BitSet.cpp HexBin.cpp
KVStringPair.cpp NameIdPool.c
OutOfMemoryException.hpp QName.cpp
RefHash3KeysIdPool.c RefHashTableOf.c
ValueArrayOf.c ValueVectorOf.c XMLBigInteger.cpp
XMLDateTime.cpp XMLEnumerator.hpp XMLException.cpp
XMLNumber.cpp XMLNumber.hpp
XMLResourceIdentifier.hpp XMLString.cpp XMLUri.cpp
XMLURL.cpp
c/src/xercesc/util/regx BMPattern.cpp Match.cpp
c/src/xercesc/util/Transcoders/Cygwin CygwinTransService.cpp
CygwinTransService.hpp
Log:
Removed warnings
Revision Changes Path
1.9 +3 -1 xml-xerces/c/src/xercesc/util/BaseRefVectorOf.c
Index: BaseRefVectorOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/BaseRefVectorOf.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BaseRefVectorOf.c 11 Nov 2004 01:31:54 -0000 1.8
+++ BaseRefVectorOf.c 7 Jan 2005 15:12:10 -0000 1.9
@@ -312,7 +312,9 @@
template <class TElem> BaseRefVectorEnumerator<TElem>::
BaseRefVectorEnumerator(const BaseRefVectorEnumerator<TElem>& toCopy) :
- fAdopted(toCopy.fAdopted)
+ XMLEnumerator<TElem>(toCopy)
+ , XMemory(toCopy)
+ , fAdopted(toCopy.fAdopted)
, fCurIndex(toCopy.fCurIndex)
, fToEnum(toCopy.fToEnum)
{
1.5 +5 -2 xml-xerces/c/src/xercesc/util/BitSet.cpp
Index: BitSet.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/BitSet.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BitSet.cpp 8 Sep 2004 13:56:21 -0000 1.4
+++ BitSet.cpp 7 Jan 2005 15:12:10 -0000 1.5
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.5 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.4 2004/09/08 13:56:21 peiyongz
* Apache License Version 2.0
*
@@ -85,8 +88,8 @@
}
BitSet::BitSet(const BitSet& toCopy) :
-
- fMemoryManager(toCopy.fMemoryManager)
+ XMemory(toCopy)
+ , fMemoryManager(toCopy.fMemoryManager)
, fBits(0)
, fUnitLen(toCopy.fUnitLen)
{
1.7 +4 -1 xml-xerces/c/src/xercesc/util/HexBin.cpp
Index: HexBin.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/HexBin.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HexBin.cpp 10 Dec 2004 10:37:56 -0000 1.6
+++ HexBin.cpp 7 Jan 2005 15:12:10 -0000 1.7
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.7 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.6 2004/12/10 10:37:56 cargilld
* Fix problem with hexbin::decode and use XMLByte instead of XMLCh for
output of decoding.
*
@@ -188,7 +191,7 @@
int i;
for ( i = 0; i < BASELENGTH; i++ )
- hexNumberTable[i] = -1;
+ hexNumberTable[i] = (XMLByte)-1;
for ( i = chDigit_9; i >= chDigit_0; i-- )
hexNumberTable[i] = (XMLByte) (i - chDigit_0);
1.8 +6 -1 xml-xerces/c/src/xercesc/util/KVStringPair.cpp
Index: KVStringPair.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/KVStringPair.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KVStringPair.cpp 28 Oct 2004 20:14:41 -0000 1.7
+++ KVStringPair.cpp 7 Jan 2005 15:12:10 -0000 1.8
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.8 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.7 2004/10/28 20:14:41 peiyongz
* Data member reshuffle
*
@@ -119,7 +122,9 @@
}
KVStringPair::KVStringPair(const KVStringPair& toCopy)
-:fKeyAllocSize(0)
+:XSerializable(toCopy)
+,XMemory(toCopy)
+,fKeyAllocSize(0)
,fValueAllocSize(0)
,fKey(0)
,fValue(0)
1.12 +6 -2 xml-xerces/c/src/xercesc/util/NameIdPool.c
Index: NameIdPool.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NameIdPool.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NameIdPool.c 19 Nov 2004 00:50:22 -0000 1.11
+++ NameIdPool.c 7 Jan 2005 15:12:10 -0000 1.12
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.12 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.11 2004/11/19 00:50:22 cargilld
* Memory improvement to utility classes from Christian Will. Remove
dependency on XMemory.
*
@@ -358,8 +361,9 @@
template <class TElem> NameIdPoolEnumerator<TElem>::
NameIdPoolEnumerator(const NameIdPoolEnumerator<TElem>& toCopy) :
-
- fCurIndex(toCopy.fCurIndex)
+ XMLEnumerator<TElem>(toCopy)
+ , XMemory(toCopy)
+ , fCurIndex(toCopy.fCurIndex)
, fToEnum(toCopy.fToEnum)
, fMemoryManager(toCopy.fMemoryManager)
{
1.5 +2 -2 xml-xerces/c/src/xercesc/util/OutOfMemoryException.hpp
Index: OutOfMemoryException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/OutOfMemoryException.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OutOfMemoryException.hpp 18 Nov 2004 16:20:04 -0000 1.4
+++ OutOfMemoryException.hpp 7 Jan 2005 15:12:10 -0000 1.5
@@ -56,7 +56,7 @@
// constructors/destructors...
inline OutOfMemoryException::OutOfMemoryException() {}
inline OutOfMemoryException::~OutOfMemoryException() {}
-inline OutOfMemoryException::OutOfMemoryException(const
OutOfMemoryException&) {}
+inline OutOfMemoryException::OutOfMemoryException(const
OutOfMemoryException& other) : XMemory(other) {}
inline OutOfMemoryException& OutOfMemoryException::operator=(const
OutOfMemoryException&)
{
return *this;
1.15 +10 -5 xml-xerces/c/src/xercesc/util/QName.cpp
Index: QName.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/QName.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- QName.cpp 28 Oct 2004 20:14:41 -0000 1.14
+++ QName.cpp 7 Jan 2005 15:12:10 -0000 1.15
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.15 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.14 2004/10/28 20:14:41 peiyongz
* Data member reshuffle
*
@@ -100,9 +103,9 @@
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(manager)
{
}
@@ -115,9 +118,9 @@
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(manager)
{
try
@@ -145,9 +148,9 @@
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(manager)
{
try
@@ -177,13 +180,15 @@
// QName: Copy Constructors
//
---------------------------------------------------------------------------
QName::QName(const QName& qname)
-:fPrefixBufSz(0)
+:XSerializable(qname)
+,XMemory(qname)
+,fPrefixBufSz(0)
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(qname.fMemoryManager)
{
unsigned int newLen;
1.16 +6 -1 xml-xerces/c/src/xercesc/util/RefHash3KeysIdPool.c
Index: RefHash3KeysIdPool.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefHash3KeysIdPool.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RefHash3KeysIdPool.c 19 Nov 2004 00:50:22 -0000 1.15
+++ RefHash3KeysIdPool.c 7 Jan 2005 15:12:10 -0000 1.16
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.16 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.15 2004/11/19 00:50:22 cargilld
* Memory improvement to utility classes from Christian Will. Remove
dependency on XMemory.
*
@@ -458,7 +461,9 @@
template <class TVal> RefHash3KeysIdPoolEnumerator<TVal>::
RefHash3KeysIdPoolEnumerator(const RefHash3KeysIdPoolEnumerator<TVal>&
toCopy) :
- fAdoptedElems(toCopy.fAdoptedElems)
+ XMLEnumerator<TVal>(toCopy)
+ , XMemory(toCopy)
+ , fAdoptedElems(toCopy.fAdoptedElems)
, fCurIndex(toCopy.fCurIndex)
, fToEnum(toCopy.fToEnum)
, fCurElem(toCopy.fCurElem)
1.19 +6 -1 xml-xerces/c/src/xercesc/util/RefHashTableOf.c
Index: RefHashTableOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefHashTableOf.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RefHashTableOf.c 19 Nov 2004 00:50:22 -0000 1.18
+++ RefHashTableOf.c 7 Jan 2005 15:12:10 -0000 1.19
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.19 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.18 2004/11/19 00:50:22 cargilld
* Memory improvement to utility classes from Christian Will. Remove
dependency on XMemory.
*
@@ -634,7 +637,9 @@
template <class TVal> RefHashTableOfEnumerator<TVal>::
RefHashTableOfEnumerator(const RefHashTableOfEnumerator<TVal>& toCopy) :
- fAdopted(toCopy.fAdopted)
+ XMLEnumerator<TVal>(toCopy)
+ , XMemory(toCopy)
+ , fAdopted(toCopy.fAdopted)
, fCurElem(toCopy.fCurElem)
, fCurHash(toCopy.fCurHash)
, fToEnum(toCopy.fToEnum)
1.8 +5 -2 xml-xerces/c/src/xercesc/util/ValueArrayOf.c
Index: ValueArrayOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueArrayOf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ValueArrayOf.c 8 Sep 2004 13:56:23 -0000 1.7
+++ ValueArrayOf.c 7 Jan 2005 15:12:10 -0000 1.8
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.8 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.7 2004/09/08 13:56:23 peiyongz
* Apache License Version 2.0
*
@@ -94,8 +97,8 @@
template <class TElem>
ValueArrayOf<TElem>::ValueArrayOf(const ValueArrayOf<TElem>& source) :
-
- fSize(source.fSize)
+ XMemory(source)
+ , fSize(source.fSize)
, fArray(0)
, fMemoryManager(source.fMemoryManager)
{
1.12 +5 -2 xml-xerces/c/src/xercesc/util/ValueVectorOf.c
Index: ValueVectorOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueVectorOf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ValueVectorOf.c 11 Nov 2004 01:31:54 -0000 1.11
+++ ValueVectorOf.c 7 Jan 2005 15:12:10 -0000 1.12
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.12 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.11 2004/11/11 01:31:54 peiyongz
* Avoid unnecessary expansion -- patch from Christian
*
@@ -106,8 +109,8 @@
template <class TElem>
ValueVectorOf<TElem>::ValueVectorOf(const ValueVectorOf<TElem>& toCopy) :
-
- fCallDestructor(toCopy.fCallDestructor)
+ XMemory(toCopy)
+ , fCallDestructor(toCopy.fCallDestructor)
, fCurCount(toCopy.fCurCount)
, fMaxCount(toCopy.fMaxCount)
, fElemList(0)
1.15 +5 -1 xml-xerces/c/src/xercesc/util/XMLBigInteger.cpp
Index: XMLBigInteger.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLBigInteger.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLBigInteger.cpp 8 Sep 2004 13:56:24 -0000 1.14
+++ XMLBigInteger.cpp 7 Jan 2005 15:12:10 -0000 1.15
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.15 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.14 2004/09/08 13:56:24 peiyongz
* Apache License Version 2.0
*
@@ -284,7 +287,8 @@
}
XMLBigInteger::XMLBigInteger(const XMLBigInteger& toCopy)
-: fSign(toCopy.fSign)
+: XMemory(toCopy)
+, fSign(toCopy.fSign)
, fMagnitude(0)
, fRawData(0)
, fMemoryManager(toCopy.fMemoryManager)
1.30 +6 -2 xml-xerces/c/src/xercesc/util/XMLDateTime.cpp
Index: XMLDateTime.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDateTime.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XMLDateTime.cpp 28 Oct 2004 20:13:35 -0000 1.29
+++ XMLDateTime.cpp 7 Jan 2005 15:12:10 -0000 1.30
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.30 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.29 2004/10/28 20:13:35 peiyongz
* Data member reshuffle
*
@@ -537,7 +540,8 @@
// -----------------------------------------------------------------------
XMLDateTime::XMLDateTime(const XMLDateTime &toCopy)
-: fBufferMaxLen(0)
+: XMLNumber(toCopy)
+, fBufferMaxLen(0)
, fBuffer(0)
, fMemoryManager(toCopy.fMemoryManager)
{
1.6 +6 -3 xml-xerces/c/src/xercesc/util/XMLEnumerator.hpp
Index: XMLEnumerator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLEnumerator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLEnumerator.hpp 8 Sep 2004 13:56:24 -0000 1.5
+++ XMLEnumerator.hpp 7 Jan 2005 15:12:10 -0000 1.6
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.6 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.5 2004/09/08 13:56:24 peiyongz
* Apache License Version 2.0
*
@@ -73,13 +76,13 @@
virtual TElem& nextElement() = 0;
virtual void Reset() = 0;
- XMLEnumerator() {};
+ XMLEnumerator() {}
+ XMLEnumerator(const XMLEnumerator<TElem>&) {}
private:
//
-----------------------------------------------------------------------
- // Unimplemented constructors and operators
+ // Unimplemented operators
//
-----------------------------------------------------------------------
- XMLEnumerator(const XMLEnumerator<TElem>&);
XMLEnumerator<TElem>& operator=(const XMLEnumerator<TElem>&);
};
1.17 +3 -3 xml-xerces/c/src/xercesc/util/XMLException.cpp
Index: XMLException.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLException.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLException.cpp 20 Oct 2004 15:18:35 -0000 1.16
+++ XMLException.cpp 7 Jan 2005 15:12:10 -0000 1.17
@@ -157,8 +157,8 @@
XMLException::XMLException(const XMLException& toCopy) :
-
- fCode(toCopy.fCode)
+ XMemory(toCopy)
+ , fCode(toCopy.fCode)
, fSrcFile(0)
, fSrcLine(toCopy.fSrcLine)
, fMsg(XMLString::replicate(toCopy.fMsg, toCopy.fMemoryManager))
1.7 +9 -1 xml-xerces/c/src/xercesc/util/XMLNumber.cpp
Index: XMLNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLNumber.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLNumber.cpp 8 Sep 2004 13:56:24 -0000 1.6
+++ XMLNumber.cpp 7 Jan 2005 15:12:10 -0000 1.7
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.7 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.6 2004/09/08 13:56:24 peiyongz
* Apache License Version 2.0
*
@@ -59,6 +62,11 @@
XERCES_CPP_NAMESPACE_BEGIN
XMLNumber::XMLNumber()
+{}
+
+XMLNumber::XMLNumber(const XMLNumber& toCopy)
+: XSerializable(toCopy)
+, XMemory(toCopy)
{}
XMLNumber::~XMLNumber()
1.15 +6 -3 xml-xerces/c/src/xercesc/util/XMLNumber.hpp
Index: XMLNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLNumber.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLNumber.hpp 8 Sep 2004 13:56:24 -0000 1.14
+++ XMLNumber.hpp 7 Jan 2005 15:12:10 -0000 1.15
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.15 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.14 2004/09/08 13:56:24 peiyongz
* Apache License Version 2.0
*
@@ -143,12 +146,12 @@
protected:
XMLNumber();
+ XMLNumber(const XMLNumber&);
private:
//
-----------------------------------------------------------------------
- // Unimplemented constructors and operators
+ // Unimplemented operators
//
-----------------------------------------------------------------------
- XMLNumber(const XMLNumber&);
XMLNumber& operator=(const XMLNumber&);
};
1.11 +5 -2 xml-xerces/c/src/xercesc/util/XMLResourceIdentifier.hpp
Index: XMLResourceIdentifier.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLResourceIdentifier.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLResourceIdentifier.hpp 21 Dec 2004 16:32:52 -0000 1.10
+++ XMLResourceIdentifier.hpp 7 Jan 2005 15:12:10 -0000 1.11
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.11 2005/01/07 15:12:10 amassari
+ * Removed warnings
+ *
* Revision 1.10 2004/12/21 16:32:52 cargilld
* Attempt to fix various apidoc problems.
*
@@ -225,10 +228,10 @@
, const XMLCh* const publicId
, const XMLCh* const baseURI )
: fResourceIdentifierType(resourceIdentifierType)
- , fSystemId(systemId)
- , fNameSpace(nameSpace)
, fPublicId(publicId)
+ , fSystemId(systemId)
, fBaseURI(baseURI)
+ , fNameSpace(nameSpace)
{
}
1.41 +2 -2 xml-xerces/c/src/xercesc/util/XMLString.cpp
Index: XMLString.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLString.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XMLString.cpp 14 Dec 2004 02:09:20 -0000 1.40
+++ XMLString.cpp 7 Jan 2005 15:12:10 -0000 1.41
@@ -1764,7 +1764,7 @@
dstBuffer.reset();
- while (c=*pszSrc++)
+ while ((c=*pszSrc++)!=0)
{
if (c != toRemove)
dstBuffer.append(c);
1.30 +4 -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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XMLUri.cpp 6 Jan 2005 21:39:44 -0000 1.29
+++ XMLUri.cpp 7 Jan 2005 15:12:10 -0000 1.30
@@ -294,7 +294,9 @@
//Copy constructor
XMLUri::XMLUri(const XMLUri& toCopy)
-: fPort(-1)
+: XSerializable(toCopy)
+, XMemory(toCopy)
+, fPort(-1)
, fScheme(0)
, fUserInfo(0)
, fHost(0)
1.16 +7 -7 xml-xerces/c/src/xercesc/util/XMLURL.cpp
Index: XMLURL.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLURL.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLURL.cpp 8 Sep 2004 13:56:24 -0000 1.15
+++ XMLURL.cpp 7 Jan 2005 15:12:10 -0000 1.16
@@ -354,8 +354,8 @@
}
XMLURL::XMLURL(const XMLURL& toCopy) :
-
- fMemoryManager(toCopy.fMemoryManager)
+ XMemory(toCopy)
+ , fMemoryManager(toCopy.fMemoryManager)
, fFragment(0)
, fHost(0)
, fPassword(0)
@@ -913,8 +913,8 @@
//
// The first thing we will do is to check for a file name, so that
- // we don't waste time thinking its a URL. If its in the form x:\
- // or x:/ and x is an ASCII letter, then assume that's the deal.
+ // we don't waste time thinking its a URL. If its in the form x:\ or x:/
+ // and x is an ASCII letter, then assume that's the deal.
//
if (((*urlText >= chLatin_A) && (*urlText <= chLatin_Z))
|| ((*urlText >= chLatin_a) && (*urlText <= chLatin_z)))
@@ -1205,8 +1205,8 @@
//
// The first thing we will do is to check for a file name, so that
- // we don't waste time thinking its a URL. If its in the form x:\
- // or x:/ and x is an ASCII letter, then assume that's the deal.
+ // we don't waste time thinking its a URL. If its in the form x:\ or
x:/
+ // and x is an ASCII letter, then assume that's the deal.
//
if (((*urlText >= chLatin_A) && (*urlText <= chLatin_Z))
|| ((*urlText >= chLatin_a) && (*urlText <= chLatin_z)))
1.6 +4 -1 xml-xerces/c/src/xercesc/util/regx/BMPattern.cpp
Index: BMPattern.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BMPattern.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BMPattern.cpp 8 Sep 2004 13:56:47 -0000 1.5
+++ BMPattern.cpp 7 Jan 2005 15:12:11 -0000 1.6
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.6 2005/01/07 15:12:11 amassari
+ * Removed warnings
+ *
* Revision 1.5 2004/09/08 13:56:47 peiyongz
* Apache License Version 2.0
*
@@ -137,7 +140,7 @@
int patternIndex = patternLen;
int nIndex = index + 1;
- XMLCh ch;
+ XMLCh ch = 0;
while (patternIndex > 0) {
1.6 +6 -2 xml-xerces/c/src/xercesc/util/regx/Match.cpp
Index: Match.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/Match.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Match.cpp 8 Sep 2004 13:56:47 -0000 1.5
+++ Match.cpp 7 Jan 2005 15:12:11 -0000 1.6
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.6 2005/01/07 15:12:11 amassari
+ * Removed warnings
+ *
* Revision 1.5 2004/09/08 13:56:47 peiyongz
* Apache License Version 2.0
*
@@ -61,7 +64,8 @@
}
Match::Match(const Match& toCopy) :
- fNoGroups(0)
+ XMemory(toCopy)
+ , fNoGroups(0)
, fPositionsSize(0)
, fStartPositions(0)
, fEndPositions(0)
@@ -70,7 +74,7 @@
initialize(toCopy);
}
-Match& Match::operator=(const Match& toAssign){
+Match& Match::operator=(const Match& toAssign) {
initialize(toAssign);
return *this;
1.14 +15 -11
xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
Index: CygwinTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CygwinTransService.cpp 8 Sep 2004 13:56:43 -0000 1.13
+++ CygwinTransService.cpp 7 Jan 2005 15:12:11 -0000 1.14
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.14 2005/01/07 15:12:11 amassari
+ * Removed warnings
+ *
* Revision 1.13 2004/09/08 13:56:43 peiyongz
* Apache License Version 2.0
*
@@ -485,22 +488,23 @@
//
---------------------------------------------------------------------------
int CygwinTransService::auxCompareString( const XMLCh* const comp1
, const XMLCh* const comp2
- , signed long maxChars
+ , signed long sMaxChars
, const bool ignoreCase)
{
const XMLCh* args[2] = { comp1, comp2 };
XMLCh* firstBuf = NULL;
- XMLCh* secondBuf;
+ XMLCh* secondBuf = NULL;
unsigned int len = XMLString::stringLen( comp1);
unsigned int otherLen = XMLString::stringLen( comp2);
unsigned int countChar = 0;
+ unsigned int maxChars;
int theResult = 0;
// Determine at what string index the comparison stops.
- if ( maxChars != -1L )
+ if ( sMaxChars != -1L )
{
- len = ( len > maxChars ) ? maxChars : len;
- otherLen = ( otherLen > maxChars ) ? maxChars : otherLen;
+ len = ( len > (unsigned int)sMaxChars ) ? (unsigned int)sMaxChars :
len;
+ otherLen = ( otherLen > (unsigned int)sMaxChars ) ? (unsigned
int)sMaxChars : otherLen;
maxChars = ( len > otherLen ) ? otherLen : len;
}
else
@@ -608,7 +612,7 @@
bool CygwinTransService::isSpace(const XMLCh toCheck) const
{
- int theCount = 0;
+ unsigned int theCount = 0;
while ( theCount < (sizeof(gWhitespace) / sizeof(XMLCh)) )
{
if ( toCheck == gWhitespace[theCount] )
@@ -683,7 +687,7 @@
// Get an upper cased copy of the encoding name, since we use a hash
// table and we store them all in upper case.
//
- int itsLen = XMLString::stringLen( encodingName) + 1;
+ unsigned int itsLen = XMLString::stringLen( encodingName) + 1;
memcpy(
upEncoding
, encodingName
@@ -976,7 +980,7 @@
// CygwinLCPTranscoder: Implementation of the virtual transcoder interface
//
---------------------------------------------------------------------------
unsigned int CygwinLCPTranscoder::calcRequiredSize(const char* const srcText
- , MemoryManager* const
manager)
+ , MemoryManager* const
/*manager*/)
{
if (!srcText)
return 0;
@@ -986,7 +990,7 @@
unsigned int CygwinLCPTranscoder::calcRequiredSize(const XMLCh* const srcText
- , MemoryManager* const
manager)
+ , MemoryManager* const
/*manager*/)
{
if (!srcText)
return 0;
@@ -1116,7 +1120,7 @@
bool CygwinLCPTranscoder::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)
@@ -1141,7 +1145,7 @@
bool CygwinLCPTranscoder::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.8 +12 -14
xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
Index: CygwinTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CygwinTransService.hpp 8 Sep 2004 13:56:43 -0000 1.7
+++ CygwinTransService.hpp 7 Jan 2005 15:12:11 -0000 1.8
@@ -83,7 +83,14 @@
, MemoryManager* const manager
);
- virtual int auxCompareString
+private :
+ //
-----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ //
-----------------------------------------------------------------------
+ CygwinTransService(const CygwinTransService&);
+ CygwinTransService& operator=(const CygwinTransService&);
+
+ int auxCompareString
(
const XMLCh* const comp1
, const XMLCh* const comp2
@@ -91,12 +98,10 @@
, const bool ignoreCase
);
-private :
- //
-----------------------------------------------------------------------
- // Unimplemented constructors and operators
- //
-----------------------------------------------------------------------
- CygwinTransService(const CygwinTransService&);
- CygwinTransService& operator=(const CygwinTransService&);
+ static bool isAlias(const HKEY encodingKey
+ , char* const aliasBuf = 0
+ , const unsigned int nameBufSz = 0);
+
// This is a hash table of entries which map encoding names to their
// Windows specific code pages. The code page allows us to create
@@ -105,13 +110,6 @@
//
// This map is shared unsynchronized among all threads of the
process,
// which is cool since it will be read only once its initialized.
-
-
-
- static bool isAlias(const HKEY encodingKey
- , char* const aliasBuf = 0
- , const unsigned int nameBufSz = 0);
-
RefHashTableOf<CPMapEntry> *fCPMap;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
