diff --git a/src/xercesc/util/BaseRefVectorOf.c b/src/xercesc/util/BaseRefVectorOf.c
index 2396f5d911fe1498c4504b9733326a1453e10d7c..49f8f01625d02783b51d1fca13e620529c488744 100644
--- a/src/xercesc/util/BaseRefVectorOf.c
+++ b/src/xercesc/util/BaseRefVectorOf.c
@@ -312,7 +312,9 @@ template <class TElem> BaseRefVectorEnumerator<TElem>::~BaseRefVectorEnumerator(
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)
{
diff --git a/src/xercesc/util/BitSet.cpp b/src/xercesc/util/BitSet.cpp
index 28c1bf2880adf7708846a7516ba1d51ed7c77fea..914916f318126b88731ef65ab9e6e79d0e8c9332 100644
--- a/src/xercesc/util/BitSet.cpp
+++ b/src/xercesc/util/BitSet.cpp
@@ -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 unsigned int size
}
BitSet::BitSet(const BitSet& toCopy) :
-
- fMemoryManager(toCopy.fMemoryManager)
+ XMemory(toCopy)
+ , fMemoryManager(toCopy.fMemoryManager)
, fBits(0)
, fUnitLen(toCopy.fUnitLen)
{
diff --git a/src/xercesc/util/HexBin.cpp b/src/xercesc/util/HexBin.cpp
index c1bd7b9cc2bff907a46105e528127932740e6b57..8c80a2deca5d6687f02f2820562548c6519e567a 100644
--- a/src/xercesc/util/HexBin.cpp
+++ b/src/xercesc/util/HexBin.cpp
@@ -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 @@ void HexBin::init()
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);
diff --git a/src/xercesc/util/KVStringPair.cpp b/src/xercesc/util/KVStringPair.cpp
index d51bca02816b091d98c7cd8a42025db120f82af2..bdf9005b60745846f11772d792b16b42317c45ff 100644
--- a/src/xercesc/util/KVStringPair.cpp
+++ b/src/xercesc/util/KVStringPair.cpp
@@ -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 XMLCh* const key,
}
KVStringPair::KVStringPair(const KVStringPair& toCopy)
-:fKeyAllocSize(0)
+:XSerializable(toCopy)
+,XMemory(toCopy)
+,fKeyAllocSize(0)
,fValueAllocSize(0)
,fKey(0)
,fValue(0)
diff --git a/src/xercesc/util/NameIdPool.c b/src/xercesc/util/NameIdPool.c
index 74f35f4f13143004eaa9e474a444396b40b9937c..fb1079264ed788477957be87258cf2599e07c8b0 100644
--- a/src/xercesc/util/NameIdPool.c
+++ b/src/xercesc/util/NameIdPool.c
@@ -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 @@ NameIdPoolEnumerator(NameIdPool<TElem>* const toEnum
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)
{
diff --git a/src/xercesc/util/OutOfMemoryException.hpp b/src/xercesc/util/OutOfMemoryException.hpp
index 451b4b3b14ec86137f4955992e3c0df5b5831a0f..133c4cc88a68f0169fe13fbf78ff638896d2b2c6 100755
--- a/src/xercesc/util/OutOfMemoryException.hpp
+++ b/src/xercesc/util/OutOfMemoryException.hpp
@@ -56,7 +56,7 @@ public:
// 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;
diff --git a/src/xercesc/util/QName.cpp b/src/xercesc/util/QName.cpp
index 7b618a963a5264d14d943890eed968cdcd2e7f9d..15392cf1df9fabe7a9c77689ea25dd00a1a1e173 100644
--- a/src/xercesc/util/QName.cpp
+++ b/src/xercesc/util/QName.cpp
@@ -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 @@ QName::QName(MemoryManager* const manager)
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(manager)
{
}
@@ -115,9 +118,9 @@ QName::QName( const XMLCh* const prefix
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(manager)
{
try
@@ -145,9 +148,9 @@ QName::QName( const XMLCh* const rawName
,fLocalPartBufSz(0)
,fRawNameBufSz(0)
,fURIId(0)
-,fRawName(0)
,fPrefix(0)
,fLocalPart(0)
+,fRawName(0)
,fMemoryManager(manager)
{
try
@@ -177,13 +180,15 @@ QName::~QName()
// 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;
diff --git a/src/xercesc/util/RefHash3KeysIdPool.c b/src/xercesc/util/RefHash3KeysIdPool.c
index f678ac10a840f8b41edd2221ed529b26e9bade80..6c760822000c46191717cc9701f2d89959f8dfd9 100644
--- a/src/xercesc/util/RefHash3KeysIdPool.c
+++ b/src/xercesc/util/RefHash3KeysIdPool.c
@@ -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>::~RefHash3KeysIdPoolEnu
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)
diff --git a/src/xercesc/util/RefHashTableOf.c b/src/xercesc/util/RefHashTableOf.c
index 73c80fa2d8e399b85be637e6ebea7f0b5cadc74a..6f27cece35984a6047791de85f2e3518a4fedb2b 100644
--- a/src/xercesc/util/RefHashTableOf.c
+++ b/src/xercesc/util/RefHashTableOf.c
@@ -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(
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)
diff --git a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
index 25866a399979bc937117c526b880971029dbfda3..f17ed592cdb944d6d202eff77edee10aef32aceb 100644
--- a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
+++ b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
@@ -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 @@ CygwinTransService::~CygwinTransService()
// ---------------------------------------------------------------------------
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 @@ const XMLCh* CygwinTransService::getId() const
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 @@ CygwinTransService::makeNewXMLTranscoder(const XMLCh* const encoding
// 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::~CygwinLCPTranscoder()
// 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 char* const srcText
unsigned int CygwinLCPTranscoder::calcRequiredSize(const XMLCh* const srcText
- , MemoryManager* const manager)
+ , MemoryManager* const /*manager*/)
{
if (!srcText)
return 0;
@@ -1116,7 +1120,7 @@ XMLCh* CygwinLCPTranscoder::transcode(const char* const toTranscode,
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 char* const toTranscode
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)
diff --git a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
index 2a11f3866c7c652ac8e58301e8f18fd88095c1fa..97733ca960b377bebad440128232e5f6893e1a59 100644
--- a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
+++ b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
@@ -83,7 +83,14 @@ protected :
, 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 @@ protected :
, 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
@@ -106,13 +111,6 @@ private :
// 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;
};
diff --git a/src/xercesc/util/ValueArrayOf.c b/src/xercesc/util/ValueArrayOf.c
index 534e227ca1d4b786782866abbd72009b28bc04ac..d314e1bb1330e52623b8e6d722937bef7b0df5d1 100644
--- a/src/xercesc/util/ValueArrayOf.c
+++ b/src/xercesc/util/ValueArrayOf.c
@@ -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 @@ ValueArrayOf<TElem>::ValueArrayOf( const TElem* values
template <class TElem>
ValueArrayOf<TElem>::ValueArrayOf(const ValueArrayOf<TElem>& source) :
-
- fSize(source.fSize)
+ XMemory(source)
+ , fSize(source.fSize)
, fArray(0)
, fMemoryManager(source.fMemoryManager)
{
diff --git a/src/xercesc/util/ValueVectorOf.c b/src/xercesc/util/ValueVectorOf.c
index 02d5d682b13e5ca571a806d0ec16674116347dfd..3d10b6968279e2e65e1d4cbd269785b60d760727 100644
--- a/src/xercesc/util/ValueVectorOf.c
+++ b/src/xercesc/util/ValueVectorOf.c
@@ -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 @@ ValueVectorOf<TElem>::ValueVectorOf(const unsigned int maxElems,
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)
diff --git a/src/xercesc/util/XMLBigInteger.cpp b/src/xercesc/util/XMLBigInteger.cpp
index 26e8cc67fb01e2cc59f5017a21c9fbaf790aeb6f..d716e414062b24242bf83ddc3e1327b69fd3b8af 100644
--- a/src/xercesc/util/XMLBigInteger.cpp
+++ b/src/xercesc/util/XMLBigInteger.cpp
@@ -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()
}
XMLBigInteger::XMLBigInteger(const XMLBigInteger& toCopy)
-: fSign(toCopy.fSign)
+: XMemory(toCopy)
+, fSign(toCopy.fSign)
, fMagnitude(0)
, fRawData(0)
, fMemoryManager(toCopy.fMemoryManager)
diff --git a/src/xercesc/util/XMLDateTime.cpp b/src/xercesc/util/XMLDateTime.cpp
index b7532a20d97aad39e617e8c8fb52d7b7becff2cd..21f2d0df97886af204a13c62e2e6fa8c03dde0b7 100644
--- a/src/xercesc/util/XMLDateTime.cpp
+++ b/src/xercesc/util/XMLDateTime.cpp
@@ -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 XMLCh* const aString,
// -----------------------------------------------------------------------
XMLDateTime::XMLDateTime(const XMLDateTime &toCopy)
-: fBufferMaxLen(0)
+: XMLNumber(toCopy)
+, fBufferMaxLen(0)
, fBuffer(0)
, fMemoryManager(toCopy.fMemoryManager)
{
diff --git a/src/xercesc/util/XMLEnumerator.hpp b/src/xercesc/util/XMLEnumerator.hpp
index 7ef2077ad8dd3278c1472550395b0bf1fe95378e..f0b0bc3f58ad01c94c7fe579696f0176ca65b97d 100644
--- a/src/xercesc/util/XMLEnumerator.hpp
+++ b/src/xercesc/util/XMLEnumerator.hpp
@@ -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 @@ public :
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>&);
};
diff --git a/src/xercesc/util/XMLException.cpp b/src/xercesc/util/XMLException.cpp
index a4c3d04d260e8edbe09fbd4344c08ce609d8cb4e..dd8e5690a8f9400edec2392d90f0f96aacf1dcdd 100644
--- a/src/xercesc/util/XMLException.cpp
+++ b/src/xercesc/util/XMLException.cpp
@@ -157,8 +157,8 @@ XMLException::XMLException( const char* const srcFile
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))
diff --git a/src/xercesc/util/XMLNumber.cpp b/src/xercesc/util/XMLNumber.cpp
index 0ab86ebf3570b30ff0ab0ef8b5453a9e4cc5da65..f4e06369b761b07db199c5fa4f7794255670fc68 100644
--- a/src/xercesc/util/XMLNumber.cpp
+++ b/src/xercesc/util/XMLNumber.cpp
@@ -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
*
@@ -61,6 +64,11 @@ XERCES_CPP_NAMESPACE_BEGIN
XMLNumber::XMLNumber()
{}
+XMLNumber::XMLNumber(const XMLNumber& toCopy)
+: XSerializable(toCopy)
+, XMemory(toCopy)
+{}
+
XMLNumber::~XMLNumber()
{}
diff --git a/src/xercesc/util/XMLNumber.hpp b/src/xercesc/util/XMLNumber.hpp
index 1db7eaceab03f547cef2e67f7839f7e5b3f0067c..89fbe83f4982796d8b75430e0984b1bcc17f7f43 100644
--- a/src/xercesc/util/XMLNumber.hpp
+++ b/src/xercesc/util/XMLNumber.hpp
@@ -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 @@ public:
protected:
XMLNumber();
+ XMLNumber(const XMLNumber&);
private:
// -----------------------------------------------------------------------
- // Unimplemented constructors and operators
+ // Unimplemented operators
// -----------------------------------------------------------------------
- XMLNumber(const XMLNumber&);
XMLNumber& operator=(const XMLNumber&);
};
diff --git a/src/xercesc/util/XMLResourceIdentifier.hpp b/src/xercesc/util/XMLResourceIdentifier.hpp
index 93b3eb90eeeaf5df7e4a84caa2d749055af39921..4712710db2650766b3bd79f943168df0d234975e 100644
--- a/src/xercesc/util/XMLResourceIdentifier.hpp
+++ b/src/xercesc/util/XMLResourceIdentifier.hpp
@@ -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 @@ inline XMLResourceIdentifier::XMLResourceIdentifier(const ResourceIdentifierType
, const XMLCh* const publicId
, const XMLCh* const baseURI )
: fResourceIdentifierType(resourceIdentifierType)
- , fSystemId(systemId)
- , fNameSpace(nameSpace)
, fPublicId(publicId)
+ , fSystemId(systemId)
, fBaseURI(baseURI)
+ , fNameSpace(nameSpace)
{
}
diff --git a/src/xercesc/util/XMLString.cpp b/src/xercesc/util/XMLString.cpp
index 2af615c90f65a08d849b15b26eac43693d5edbdb..54adc5ab2f8246b369ce2f419d58ab45b5d6d8b7 100644
--- a/src/xercesc/util/XMLString.cpp
+++ b/src/xercesc/util/XMLString.cpp
@@ -1764,7 +1764,7 @@ void XMLString::removeChar(const XMLCh* const srcString
dstBuffer.reset();
- while (c=*pszSrc++)
+ while ((c=*pszSrc++)!=0)
{
if (c != toRemove)
dstBuffer.append(c);
diff --git a/src/xercesc/util/XMLURL.cpp b/src/xercesc/util/XMLURL.cpp
index 7f0b0b4038a99f15ac48d2ede2963b32c7ea53fb..f7800ac94f89e235343cee04e578e97a75fdff1f 100644
--- a/src/xercesc/util/XMLURL.cpp
+++ b/src/xercesc/util/XMLURL.cpp
@@ -354,8 +354,8 @@ XMLURL::XMLURL(const char* const urlText,
}
XMLURL::XMLURL(const XMLURL& toCopy) :
-
- fMemoryManager(toCopy.fMemoryManager)
+ XMemory(toCopy)
+ , fMemoryManager(toCopy.fMemoryManager)
, fFragment(0)
, fHost(0)
, fPassword(0)
@@ -913,8 +913,8 @@ void XMLURL::parse(const XMLCh* const urlText)
//
// 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 @@ bool XMLURL::parse(const XMLCh* const urlText, XMLURL& xmlURL)
//
// 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)))
diff --git a/src/xercesc/util/XMLUri.cpp b/src/xercesc/util/XMLUri.cpp
index 599b3bd919b4b7a28140687c1c8b309e2ddf95bd..7481c1eff7d393874d2143016b324f474c2e2083 100644
--- a/src/xercesc/util/XMLUri.cpp
+++ b/src/xercesc/util/XMLUri.cpp
@@ -294,7 +294,9 @@ XMLUri::XMLUri(const XMLUri* const baseURI
//Copy constructor
XMLUri::XMLUri(const XMLUri& toCopy)
-: fPort(-1)
+: XSerializable(toCopy)
+, XMemory(toCopy)
+, fPort(-1)
, fScheme(0)
, fUserInfo(0)
, fHost(0)
diff --git a/src/xercesc/util/regx/BMPattern.cpp b/src/xercesc/util/regx/BMPattern.cpp
index 1ca7d5e778cfdc6fcf474151ae57fc3f26ae8915..61c10f6fac5b6053ae1d18388c61bc492b80b168 100644
--- a/src/xercesc/util/regx/BMPattern.cpp
+++ b/src/xercesc/util/regx/BMPattern.cpp
@@ -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 BMPattern::matches(const XMLCh* const content, int start, int limit) {
int patternIndex = patternLen;
int nIndex = index + 1;
- XMLCh ch;
+ XMLCh ch = 0;
while (patternIndex > 0) {
diff --git a/src/xercesc/util/regx/Match.cpp b/src/xercesc/util/regx/Match.cpp
index 2510c8e2758addbd9aae11e9f79ab0c6b8cea5e2..83b6269c1364aeb415124be05c1852212618df08 100644
--- a/src/xercesc/util/regx/Match.cpp
+++ b/src/xercesc/util/regx/Match.cpp
@@ -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(MemoryManager* const manager) :
}
Match::Match(const Match& toCopy) :
- fNoGroups(0)
+ XMemory(toCopy)
+ , fNoGroups(0)
, fPositionsSize(0)
, fStartPositions(0)
, fEndPositions(0)
@@ -70,7 +74,7 @@ Match::Match(const Match& toCopy) :
initialize(toCopy);
}
-Match& Match::operator=(const Match& toAssign){
+Match& Match::operator=(const Match& toAssign) {
initialize(toAssign);
return *this;