You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2004/01/29 12:48:50 UTC
cvs commit: xml-xerces/c/src/xercesc/util BaseRefVectorOf.c BaseRefVectorOf.hpp BinFileInputStream.hpp BinMemInputStream.hpp BitSet.hpp FlagJanitor.c HashBase.hpp HashCMStateSet.hpp HashPtr.hpp HashXMLCh.hpp HexBin.hpp Janitor.hpp KeyRefPair.c KeyRefPair.hpp KeyValuePair.hpp KVStringPair.hpp NameIdPool.hpp OutOfMemoryException.hpp PlatformUtils.hpp QName.hpp RefArrayOf.hpp RefArrayVectorOf.hpp RefHash2KeysTableOf.hpp RefHash3KeysIdPool.c RefHash3KeysIdPool.hpp RefHashTableOf.c RefHashTableOf.hpp RefStackOf.hpp RefVectorOf.hpp SecurityManager.hpp StringPool.cpp TransService.cpp TransService.hpp ValueArrayOf.hpp ValueHashTableOf.hpp ValueStackOf.hpp ValueVectorOf.hpp XMLAbstractDoubleFloat.cpp XMLAbstractDoubleFloat.hpp XMLBigInteger.hpp XMLChar.cpp XMLChar.hpp XMLChTranscoder.cpp XMLDateTime.cpp XMLDateTime.hpp XMLDeleterFor.hpp XMLDOMMsg.hpp XMLEnumerator.hpp XMLException.cpp XMLExceptMsgs.hpp XMLInteger.hpp XMLNumber.cpp XMLNumber.hpp XMLRegisterCleanup.hpp XMLResourceIdentifier.hpp XMLStringTokenizer.cpp XMLStringTokenizer.hpp XMLUCSTranscoder.cpp XMLUni.hpp XMLUTF16Transcoder.cpp XMLUTF8Transcoder.cpp
cargilld 2004/01/29 03:48:50
Modified: c/src/xercesc/util BaseRefVectorOf.c BaseRefVectorOf.hpp
BinFileInputStream.hpp BinMemInputStream.hpp
BitSet.hpp FlagJanitor.c HashBase.hpp
HashCMStateSet.hpp HashPtr.hpp HashXMLCh.hpp
HexBin.hpp Janitor.hpp KeyRefPair.c KeyRefPair.hpp
KeyValuePair.hpp KVStringPair.hpp NameIdPool.hpp
OutOfMemoryException.hpp PlatformUtils.hpp
QName.hpp RefArrayOf.hpp RefArrayVectorOf.hpp
RefHash2KeysTableOf.hpp RefHash3KeysIdPool.c
RefHash3KeysIdPool.hpp RefHashTableOf.c
RefHashTableOf.hpp RefStackOf.hpp RefVectorOf.hpp
SecurityManager.hpp StringPool.cpp TransService.cpp
TransService.hpp ValueArrayOf.hpp
ValueHashTableOf.hpp ValueStackOf.hpp
ValueVectorOf.hpp XMLAbstractDoubleFloat.cpp
XMLAbstractDoubleFloat.hpp XMLBigInteger.hpp
XMLChar.cpp XMLChar.hpp XMLChTranscoder.cpp
XMLDateTime.cpp XMLDateTime.hpp XMLDeleterFor.hpp
XMLDOMMsg.hpp XMLEnumerator.hpp XMLException.cpp
XMLExceptMsgs.hpp XMLInteger.hpp XMLNumber.cpp
XMLNumber.hpp XMLRegisterCleanup.hpp
XMLResourceIdentifier.hpp XMLStringTokenizer.cpp
XMLStringTokenizer.hpp XMLUCSTranscoder.cpp
XMLUni.hpp XMLUTF16Transcoder.cpp
XMLUTF8Transcoder.cpp
Log:
Code cleanup changes to get rid of various compiler diagnostic messages.
Revision Changes Path
1.6 +7 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseRefVectorOf.c 17 Dec 2003 00:18:35 -0000 1.5
+++ BaseRefVectorOf.c 29 Jan 2004 11:48:46 -0000 1.6
@@ -350,7 +350,13 @@
delete fToEnum;
}
-
+template <class TElem> BaseRefVectorEnumerator<TElem>::
+BaseRefVectorEnumerator(const BaseRefVectorEnumerator<TElem>& toCopy) :
+ fAdopted(toCopy.fAdopted)
+ , fCurIndex(toCopy.fCurIndex)
+ , fToEnum(toCopy.fToEnum)
+{
+}
// ---------------------------------------------------------------------------
// RefBaseRefVectorEnumerator: Enum interface
// ---------------------------------------------------------------------------
1.6 +12 -2 xml-xerces/c/src/xercesc/util/BaseRefVectorOf.hpp
Index: BaseRefVectorOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/BaseRefVectorOf.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseRefVectorOf.hpp 27 May 2003 16:52:16 -0000 1.5
+++ BaseRefVectorOf.hpp 29 Jan 2004 11:48:46 -0000 1.6
@@ -115,6 +115,12 @@
// -----------------------------------------------------------------------
void ensureExtraCapacity(const unsigned int length);
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BaseRefVectorOf(const BaseRefVectorOf<TElem>& copy);
+ BaseRefVectorOf& operator=(const BaseRefVectorOf<TElem>& copy);
protected:
// -----------------------------------------------------------------------
@@ -132,7 +138,7 @@
// An enumerator for a vector. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class BaseRefVectorEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class BaseRefVectorEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -145,7 +151,7 @@
);
virtual ~BaseRefVectorEnumerator();
-
+ BaseRefVectorEnumerator(const BaseRefVectorEnumerator<TElem>& copy);
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
@@ -155,6 +161,10 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BaseRefVectorEnumerator& operator=(const BaseRefVectorEnumerator<TElem>& copy);
// -----------------------------------------------------------------------
// Data Members
//
1.6 +10 -0 xml-xerces/c/src/xercesc/util/BinFileInputStream.hpp
Index: BinFileInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/BinFileInputStream.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BinFileInputStream.hpp 17 Dec 2003 13:58:02 -0000 1.5
+++ BinFileInputStream.hpp 29 Jan 2004 11:48:46 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/12/17 13:58:02 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -142,6 +145,12 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinFileInputStream(const BinFileInputStream&);
+ BinFileInputStream& operator=(const BinFileInputStream&);
+
// -----------------------------------------------------------------------
// Private data members
//
1.4 +8 -0 xml-xerces/c/src/xercesc/util/BinMemInputStream.hpp
Index: BinMemInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/BinMemInputStream.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BinMemInputStream.hpp 16 May 2003 03:11:22 -0000 1.3
+++ BinMemInputStream.hpp 29 Jan 2004 11:48:46 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/16 03:11:22 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -132,6 +135,11 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinMemInputStream(const BinMemInputStream&);
+ BinMemInputStream& operator=(const BinMemInputStream&);
// -----------------------------------------------------------------------
// Private data members
//
1.4 +5 -3 xml-xerces/c/src/xercesc/util/BitSet.hpp
Index: BitSet.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/BitSet.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BitSet.hpp 15 May 2003 19:04:35 -0000 1.3
+++ BitSet.hpp 29 Jan 2004 11:48:46 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/15 19:04:35 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -145,9 +148,8 @@
// -----------------------------------------------------------------------
// Unimplemented constructors
// -----------------------------------------------------------------------
- BitSet();
-
-
+ BitSet();
+ BitSet& operator=(const BitSet&);
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
1.3 +5 -2 xml-xerces/c/src/xercesc/util/FlagJanitor.c
Index: FlagJanitor.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/FlagJanitor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlagJanitor.c 4 Nov 2002 15:22:03 -0000 1.2
+++ FlagJanitor.c 29 Jan 2004 11:48:46 -0000 1.3
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2002/11/04 15:22:03 tng
* C++ Namespace Support.
*
@@ -92,9 +95,9 @@
// Constructors and Destructor
// ---------------------------------------------------------------------------
template <class T> FlagJanitor<T>::FlagJanitor(T* const valPtr, const T newVal)
+: fValPtr(valPtr)
{
- // Store the pointer, save the org value, and store the new value
- fValPtr = valPtr;
+ // Store the pointer, save the org value, and store the new value
if (fValPtr)
{
fOldVal = *fValPtr;
1.5 +11 -1 xml-xerces/c/src/xercesc/util/HashBase.hpp
Index: HashBase.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/HashBase.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HashBase.hpp 17 Dec 2003 00:18:35 -0000 1.4
+++ HashBase.hpp 29 Jan 2004 11:48:46 -0000 1.5
@@ -69,7 +69,7 @@
* designed to produce hash values for XMLCh* strings. Any hasher inheriting
* from <code>HashBase</code> may be specified when the RefHashTableOf hashtable is constructed.
*/
- class XMLUTIL_EXPORT HashBase : public XMemory
+class XMLUTIL_EXPORT HashBase : public XMemory
{
public:
@@ -93,6 +93,16 @@
*/
virtual bool equals(const void *const key1, const void *const key2) = 0;
+ virtual ~HashBase() {};
+
+ HashBase() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashBase(const HashBase&);
+ HashBase& operator=(const HashBase&);
};
XERCES_CPP_NAMESPACE_END
1.4 +11 -3 xml-xerces/c/src/xercesc/util/HashCMStateSet.hpp
Index: HashCMStateSet.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/HashCMStateSet.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HashCMStateSet.hpp 17 Dec 2003 00:18:35 -0000 1.3
+++ HashCMStateSet.hpp 29 Jan 2004 11:48:46 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -98,7 +101,12 @@
virtual unsigned int getHashVal(const void *const key, unsigned int mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashCMStateSet(const HashCMStateSet&);
+ HashCMStateSet& operator=(const HashCMStateSet&);
};
inline HashCMStateSet::HashCMStateSet()
@@ -110,7 +118,7 @@
}
inline unsigned int HashCMStateSet::getHashVal(const void *const key, unsigned int mod
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
const CMStateSet* const pkey = (const CMStateSet* const) key;
return ((pkey->hashCode()) % mod);
1.6 +6 -1 xml-xerces/c/src/xercesc/util/HashPtr.hpp
Index: HashPtr.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/HashPtr.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HashPtr.hpp 17 Dec 2003 00:18:35 -0000 1.5
+++ HashPtr.hpp 29 Jan 2004 11:48:46 -0000 1.6
@@ -77,7 +77,12 @@
virtual unsigned int getHashVal(const void *const key, unsigned int mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashPtr(const HashPtr&);
+ HashPtr& operator=(const HashPtr&);
};
XERCES_CPP_NAMESPACE_END
1.5 +6 -1 xml-xerces/c/src/xercesc/util/HashXMLCh.hpp
Index: HashXMLCh.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/HashXMLCh.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HashXMLCh.hpp 17 Dec 2003 00:18:35 -0000 1.4
+++ HashXMLCh.hpp 29 Jan 2004 11:48:46 -0000 1.5
@@ -77,7 +77,12 @@
virtual unsigned int getHashVal(const void *const key, unsigned int mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashXMLCh(const HashXMLCh&);
+ HashXMLCh& operator=(const HashXMLCh&);
};
XERCES_CPP_NAMESPACE_END
1.3 +2 -1 xml-xerces/c/src/xercesc/util/HexBin.hpp
Index: HexBin.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/HexBin.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HexBin.hpp 4 Nov 2002 15:22:03 -0000 1.2
+++ HexBin.hpp 29 Jan 2004 11:48:46 -0000 1.3
@@ -109,6 +109,7 @@
// -----------------------------------------------------------------------
HexBin();
HexBin(const HexBin&);
+ HexBin& operator=(const HexBin&);
// -----------------------------------------------------------------------
// Private data members
1.5 +5 -0 xml-xerces/c/src/xercesc/util/Janitor.hpp
Index: Janitor.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Janitor.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Janitor.hpp 6 Nov 2003 19:28:11 -0000 1.4
+++ Janitor.hpp 29 Jan 2004 11:48:46 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/11/06 19:28:11 knoaman
* PSVI support for annotations.
*
@@ -134,6 +137,7 @@
// -----------------------------------------------------------------------
Janitor();
Janitor(const Janitor<T>&);
+ Janitor<T>& operator=(const Janitor<T>&);
// -----------------------------------------------------------------------
// Private data members
@@ -176,6 +180,7 @@
// -----------------------------------------------------------------------
ArrayJanitor();
ArrayJanitor(const ArrayJanitor<T>& copy);
+ ArrayJanitor& operator=(const ArrayJanitor<T>& copy);
// -----------------------------------------------------------------------
// Private data members
1.4 +10 -1 xml-xerces/c/src/xercesc/util/KeyRefPair.c
Index: KeyRefPair.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/KeyRefPair.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KeyRefPair.c 4 Nov 2002 15:22:04 -0000 1.3
+++ KeyRefPair.c 29 Jan 2004 11:48:46 -0000 1.4
@@ -91,6 +91,15 @@
{
}
+template <class TKey, class TValue> KeyRefPair<TKey,TValue>::
+KeyRefPair(const KeyRefPair<TKey,TValue>& toCopy) :
+
+ fKey(toCopy.fKey)
+ , fValue(toCopy.fValue)
+{
+}
+
+
template <class TKey, class TValue> KeyRefPair<TKey,TValue>::~KeyRefPair()
{
}
1.4 +4 -1 xml-xerces/c/src/xercesc/util/KeyRefPair.hpp
Index: KeyRefPair.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/KeyRefPair.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KeyRefPair.hpp 15 May 2003 19:04:35 -0000 1.3
+++ KeyRefPair.hpp 29 Jan 2004 11:48:46 -0000 1.4
@@ -75,6 +75,7 @@
KeyRefPair();
KeyRefPair(TKey* key, TValue* value);
KeyRefPair(const KeyRefPair<TKey,TValue>* toCopy);
+ KeyRefPair(const KeyRefPair<TKey,TValue>& toCopy);
~KeyRefPair();
@@ -95,6 +96,8 @@
private :
+ // unimplemented:
+ KeyRefPair<TKey,TValue>& operator=(const KeyRefPair<TKey,TValue>&);
// -------------------------------------------------------------------
// Private data members
//
1.4 +6 -0 xml-xerces/c/src/xercesc/util/KeyValuePair.hpp
Index: KeyValuePair.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/KeyValuePair.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KeyValuePair.hpp 15 May 2003 19:04:35 -0000 1.3
+++ KeyValuePair.hpp 29 Jan 2004 11:48:46 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/15 19:04:35 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -121,6 +124,9 @@
private :
+ // unimplemented:
+ KeyValuePair<TKey,TValue>& operator=(const KeyValuePair<TKey,TValue>&);
+
// -------------------------------------------------------------------
// Private data members
//
1.7 +6 -0 xml-xerces/c/src/xercesc/util/KVStringPair.hpp
Index: KVStringPair.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/KVStringPair.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KVStringPair.hpp 25 Sep 2003 22:23:25 -0000 1.6
+++ KVStringPair.hpp 29 Jan 2004 11:48:46 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/09/25 22:23:25 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -186,6 +189,9 @@
DECL_XSERIALIZABLE(KVStringPair)
private :
+ // unimplemented:
+
+ KVStringPair& operator=(const KVStringPair&);
// -----------------------------------------------------------------------
// Private data members
//
1.9 +10 -1 xml-xerces/c/src/xercesc/util/NameIdPool.hpp
Index: NameIdPool.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NameIdPool.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NameIdPool.hpp 17 Dec 2003 00:18:35 -0000 1.8
+++ NameIdPool.hpp 29 Jan 2004 11:48:46 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -160,6 +163,12 @@
TElem* fData;
NameIdPoolBucketElem<TElem>* fNext;
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ NameIdPoolBucketElem(const NameIdPoolBucketElem<TElem>&);
+ NameIdPoolBucketElem<TElem>& operator=(const NameIdPoolBucketElem<TElem>&);
};
@@ -272,7 +281,7 @@
// An enumerator for a name id pool. It derives from the basic enumerator
// class, so that pools can be generically enumerated.
//
-template <class TElem> class NameIdPoolEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class NameIdPoolEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
1.2 +3 -3 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OutOfMemoryException.hpp 1 Oct 2003 16:32:39 -0000 1.1
+++ OutOfMemoryException.hpp 29 Jan 2004 11:48:46 -0000 1.2
@@ -96,8 +96,8 @@
// constructors/destructors...
inline OutOfMemoryException::OutOfMemoryException() {}
inline OutOfMemoryException::~OutOfMemoryException() {}
-inline OutOfMemoryException::OutOfMemoryException(const OutOfMemoryException& toCopy) {}
-inline OutOfMemoryException& OutOfMemoryException::operator=(const OutOfMemoryException& toAssign)
+inline OutOfMemoryException::OutOfMemoryException(const OutOfMemoryException&) {}
+inline OutOfMemoryException& OutOfMemoryException::operator=(const OutOfMemoryException&)
{
return *this;
}
1.24 +6 -1 xml-xerces/c/src/xercesc/util/PlatformUtils.hpp
Index: PlatformUtils.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/PlatformUtils.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PlatformUtils.hpp 9 Jan 2004 04:39:56 -0000 1.23
+++ PlatformUtils.hpp 29 Jan 2004 11:48:46 -0000 1.24
@@ -742,6 +742,11 @@
static inline size_t alignPointerForNewBlockAllocation(size_t ptrSize);
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLPlatformUtils();
+
/** @name Private static methods */
//@{
1.10 +7 -0 xml-xerces/c/src/xercesc/util/QName.hpp
Index: QName.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/QName.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- QName.hpp 25 Sep 2003 15:22:34 -0000 1.9
+++ QName.hpp 29 Jan 2004 11:48:46 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/09/25 15:22:34 peiyongz
* Implementation of Serialization
*
@@ -211,6 +214,10 @@
DECL_XSERIALIZABLE(QName)
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ QName& operator=(const QName&);
// -----------------------------------------------------------------------
// Private instance variables
1.6 +10 -1 xml-xerces/c/src/xercesc/util/RefArrayOf.hpp
Index: RefArrayOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefArrayOf.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RefArrayOf.hpp 16 May 2003 06:01:52 -0000 1.5
+++ RefArrayOf.hpp 29 Jan 2004 11:48:46 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -165,7 +168,7 @@
// An enumerator for a reference array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class RefArrayEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class RefArrayEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -188,6 +191,12 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefArrayEnumerator(const RefArrayEnumerator<TElem>&);
+ RefArrayEnumerator<TElem>& operator=(const RefArrayEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
1.5 +6 -0 xml-xerces/c/src/xercesc/util/RefArrayVectorOf.hpp
Index: RefArrayVectorOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefArrayVectorOf.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RefArrayVectorOf.hpp 10 Sep 2003 14:56:31 -0000 1.4
+++ RefArrayVectorOf.hpp 29 Jan 2004 11:48:46 -0000 1.5
@@ -88,6 +88,12 @@
void removeElementAt(const unsigned int removeAt);
void removeLastElement();
void cleanup();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefArrayVectorOf(const RefArrayVectorOf<TElem>&);
+ RefArrayVectorOf<TElem>& operator=(const RefArrayVectorOf<TElem>&);
};
XERCES_CPP_NAMESPACE_END
1.9 +22 -0 xml-xerces/c/src/xercesc/util/RefHash2KeysTableOf.hpp
Index: RefHash2KeysTableOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefHash2KeysTableOf.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RefHash2KeysTableOf.hpp 17 Dec 2003 00:18:35 -0000 1.8
+++ RefHash2KeysTableOf.hpp 29 Jan 2004 11:48:46 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -134,11 +137,19 @@
: fData(value), fNext(next), fKey1(key1), fKey2(key2)
{
}
+ ~RefHash2KeysTableBucketElem() {};
TVal* fData;
RefHash2KeysTableBucketElem<TVal>* fNext;
void* fKey1;
int fKey2;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash2KeysTableBucketElem(const RefHash2KeysTableBucketElem<TVal>&);
+ RefHash2KeysTableBucketElem<TVal>& operator=(const RefHash2KeysTableBucketElem<TVal>&);
};
@@ -204,6 +215,11 @@
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash2KeysTableOf(const RefHash2KeysTableOf<TVal>&);
+ RefHash2KeysTableOf<TVal>& operator=(const RefHash2KeysTableOf<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -271,6 +287,12 @@
void nextElementKey(void*&, int&);
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash2KeysTableOfEnumerator(const RefHash2KeysTableOfEnumerator<TVal>&);
+ RefHash2KeysTableOfEnumerator<TVal>& operator=(const RefHash2KeysTableOfEnumerator<TVal>&);
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
1.10 +13 -0 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RefHash3KeysIdPool.c 17 Dec 2003 00:18:35 -0000 1.9
+++ RefHash3KeysIdPool.c 29 Jan 2004 11:48:46 -0000 1.10
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.10 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -469,6 +472,16 @@
delete fToEnum;
}
+template <class TVal> RefHash3KeysIdPoolEnumerator<TVal>::
+RefHash3KeysIdPoolEnumerator(const RefHash3KeysIdPoolEnumerator<TVal>& toCopy) :
+ fAdoptedElems(toCopy.fAdoptedElems)
+ , fCurIndex(toCopy.fCurIndex)
+ , fToEnum(toCopy.fToEnum)
+ , fCurElem(toCopy.fCurElem)
+ , fCurHash(toCopy.fCurHash)
+ , fMemoryManager(toCopy.fMemoryManager)
+{
+}
// ---------------------------------------------------------------------------
// RefHash3KeysIdPoolEnumerator: Enum interface
1.9 +23 -2 xml-xerces/c/src/xercesc/util/RefHash3KeysIdPool.hpp
Index: RefHash3KeysIdPool.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefHash3KeysIdPool.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RefHash3KeysIdPool.hpp 17 Dec 2003 00:18:35 -0000 1.8
+++ RefHash3KeysIdPool.hpp 29 Jan 2004 11:48:46 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -144,12 +147,21 @@
, fKey3(key3)
{
}
+
+ RefHash3KeysTableBucketElem() {};
TVal* fData;
RefHash3KeysTableBucketElem<TVal>* fNext;
void* fKey1;
int fKey2;
int fKey3;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash3KeysTableBucketElem(const RefHash3KeysTableBucketElem<TVal>&);
+ RefHash3KeysTableBucketElem<TVal>& operator=(const RefHash3KeysTableBucketElem<TVal>&);
};
@@ -221,6 +233,11 @@
friend class RefHash3KeysIdPoolEnumerator<TVal>;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash3KeysIdPool(const RefHash3KeysIdPool<TVal>&);
+ RefHash3KeysIdPool<TVal>& operator=(const RefHash3KeysIdPool<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -279,7 +296,7 @@
// An enumerator for a value array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TVal> class RefHash3KeysIdPoolEnumerator : public XMLEnumerator<TVal>
+template <class TVal> class RefHash3KeysIdPoolEnumerator : public XMLEnumerator<TVal>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -290,7 +307,7 @@
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual ~RefHash3KeysIdPoolEnumerator();
-
+ RefHash3KeysIdPoolEnumerator(const RefHash3KeysIdPoolEnumerator<TVal>&);
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
@@ -307,6 +324,10 @@
bool hasMoreKeys() const;
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash3KeysIdPoolEnumerator<TVal>& operator=(const RefHash3KeysIdPoolEnumerator<TVal>&);
// -----------------------------------------------------------------------
// Private methods
1.13 +12 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RefHashTableOf.c 17 Dec 2003 00:18:35 -0000 1.12
+++ RefHashTableOf.c 29 Jan 2004 11:48:46 -0000 1.13
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.13 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -641,6 +644,15 @@
}
+template <class TVal> RefHashTableOfEnumerator<TVal>::
+RefHashTableOfEnumerator(const RefHashTableOfEnumerator<TVal>& toCopy) :
+ fAdopted(toCopy.fAdopted)
+ , fCurElem(toCopy.fCurElem)
+ , fCurHash(toCopy.fCurHash)
+ , fToEnum(toCopy.fToEnum)
+ , fMemoryManager(toCopy.fMemoryManager)
+{
+}
// ---------------------------------------------------------------------------
// RefHashTableOfEnumerator: Enum interface
// ---------------------------------------------------------------------------
1.13 +23 -1 xml-xerces/c/src/xercesc/util/RefHashTableOf.hpp
Index: RefHashTableOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefHashTableOf.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RefHashTableOf.hpp 17 Dec 2003 00:18:35 -0000 1.12
+++ RefHashTableOf.hpp 29 Jan 2004 11:48:46 -0000 1.13
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -168,9 +171,18 @@
{
}
+ RefHashTableBucketElem(){};
+
TVal* fData;
RefHashTableBucketElem<TVal>* fNext;
void* fKey;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHashTableBucketElem(const RefHashTableBucketElem<TVal>&);
+ RefHashTableBucketElem<TVal>& operator=(const RefHashTableBucketElem<TVal>&);
};
@@ -244,6 +256,11 @@
friend class RefHashTableOfEnumerator<TVal>;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHashTableOf(const RefHashTableOf<TVal>&);
+ RefHashTableOf<TVal>& operator=(const RefHashTableOf<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -300,7 +317,7 @@
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual ~RefHashTableOfEnumerator();
-
+ RefHashTableOfEnumerator(const RefHashTableOfEnumerator<TVal>&);
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
@@ -314,6 +331,11 @@
void* nextElementKey();
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHashTableOfEnumerator<TVal>& operator=(const RefHashTableOfEnumerator<TVal>&);
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
1.6 +14 -1 xml-xerces/c/src/xercesc/util/RefStackOf.hpp
Index: RefStackOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefStackOf.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RefStackOf.hpp 16 May 2003 06:01:52 -0000 1.5
+++ RefStackOf.hpp 29 Jan 2004 11:48:46 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -141,6 +144,11 @@
// -----------------------------------------------------------------------
friend class RefStackEnumerator<TElem>;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefStackOf(const RefStackOf<TElem>&);
+ RefStackOf<TElem>& operator=(const RefStackOf<TElem>&);
// -----------------------------------------------------------------------
// Data Members
@@ -158,7 +166,7 @@
// An enumerator for a value stack. It derives from the basic enumerator
// class, so that value stacks can be generically enumerated.
//
-template <class TElem> class RefStackEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class RefStackEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -181,6 +189,11 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefStackEnumerator(const RefStackEnumerator<TElem>&);
+ RefStackEnumerator<TElem>& operator=(const RefStackEnumerator<TElem>&);
// -----------------------------------------------------------------------
// Data Members
//
1.9 +9 -0 xml-xerces/c/src/xercesc/util/RefVectorOf.hpp
Index: RefVectorOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/RefVectorOf.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RefVectorOf.hpp 16 May 2003 06:01:52 -0000 1.8
+++ RefVectorOf.hpp 29 Jan 2004 11:48:46 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -130,6 +133,12 @@
// -----------------------------------------------------------------------
~RefVectorOf();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefVectorOf(const RefVectorOf<TElem>&);
+ RefVectorOf<TElem>& operator=(const RefVectorOf<TElem>&);
};
XERCES_CPP_NAMESPACE_END
1.3 +6 -3 xml-xerces/c/src/xercesc/util/SecurityManager.hpp
Index: SecurityManager.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/SecurityManager.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityManager.hpp 22 Apr 2003 12:53:38 -0000 1.2
+++ SecurityManager.hpp 29 Jan 2004 11:48:46 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/04/22 12:53:38 neilg
* change const static member to an enum to make MSVC happy
*
@@ -126,8 +129,8 @@
//@{
/** Default constructor */
SecurityManager()
- {
- fEntityExpansionLimit = ENTITY_EXPANSION_LIMIT;
+ : fEntityExpansionLimit(ENTITY_EXPANSION_LIMIT)
+ {
}
/** Destructor */
1.9 +18 -2 xml-xerces/c/src/xercesc/util/StringPool.cpp
Index: StringPool.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/StringPool.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StringPool.cpp 17 Dec 2003 00:18:35 -0000 1.8
+++ StringPool.cpp 29 Jan 2004 11:48:46 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -318,9 +321,22 @@
}
}
-XMLStringPool::XMLStringPool(MemoryManager* const manager)
+XMLStringPool::XMLStringPool(MemoryManager* const manager) :
+ fMemoryManager(manager)
+ , fIdMap(0)
+ , fHashTable(0)
+ , fMapCapacity(64)
+ , fCurId(1)
{
- XMLStringPool(109, manager);
+ // Create the hash table, passing it the modulus
+ fHashTable = new (fMemoryManager) RefHashTableOf<PoolElem>(109, fMemoryManager);
+
+ // Do an initial allocation of the id map and zero it all out
+ fIdMap = (PoolElem**) fMemoryManager->allocate
+ (
+ fMapCapacity * sizeof(PoolElem*)
+ ); //new PoolElem*[fMapCapacity];
+ memset(fIdMap, 0, sizeof(PoolElem*) * fMapCapacity);
}
XERCES_CPP_NAMESPACE_END
1.16 +4 -4 xml-xerces/c/src/xercesc/util/TransService.cpp
Index: TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/TransService.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TransService.cpp 17 Dec 2003 00:18:35 -0000 1.15
+++ TransService.cpp 29 Jan 2004 11:48:46 -0000 1.16
@@ -541,8 +541,8 @@
XMLTranscoder::XMLTranscoder(const XMLCh* const encodingName
, const unsigned int blockSize
, MemoryManager* const manager) :
- fEncodingName(0)
- , fBlockSize(blockSize)
+ fBlockSize(blockSize)
+ , fEncodingName(0)
, fMemoryManager(manager)
{
fEncodingName = XMLString::replicate(encodingName, fMemoryManager);
@@ -552,7 +552,7 @@
// ---------------------------------------------------------------------------
// XMLTranscoder: Protected helpers
// ---------------------------------------------------------------------------
-void XMLTranscoder::checkBlockSize(const unsigned int toCheck)
+void XMLTranscoder::checkBlockSize(const unsigned int)
{
// if (toCheck > fBlockSize)
// ThrowXML(TranscodingException, XMLExcepts::Trans_BadBlockSize);
1.12 +6 -0 xml-xerces/c/src/xercesc/util/TransService.hpp
Index: TransService.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/TransService.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TransService.hpp 24 Dec 2003 15:24:13 -0000 1.11
+++ TransService.hpp 29 Jan 2004 11:48:46 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/12/24 15:24:13 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -488,6 +491,9 @@
// -----------------------------------------------------------------------
// Protected helper methods
// -----------------------------------------------------------------------
+ // As the body of this function is commented out it could be removed.
+ // However, currently all calls to it are guarded by #if defined(XERCES_DEBUG)
+ // so will leave it for now.
void checkBlockSize(const unsigned int toCheck);
1.6 +10 -1 xml-xerces/c/src/xercesc/util/ValueArrayOf.hpp
Index: ValueArrayOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueArrayOf.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValueArrayOf.hpp 16 May 2003 06:01:52 -0000 1.5
+++ ValueArrayOf.hpp 29 Jan 2004 11:48:46 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -166,7 +169,7 @@
// An enumerator for a value array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class ValueArrayEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class ValueArrayEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -189,6 +192,12 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueArrayEnumerator(const ValueArrayEnumerator<TElem>&);
+ ValueArrayEnumerator<TElem>& operator=(const ValueArrayEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
1.11 +21 -2 xml-xerces/c/src/xercesc/util/ValueHashTableOf.hpp
Index: ValueHashTableOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueHashTableOf.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ValueHashTableOf.hpp 17 Dec 2003 00:18:35 -0000 1.10
+++ ValueHashTableOf.hpp 29 Jan 2004 11:48:46 -0000 1.11
@@ -91,10 +91,18 @@
: fData(value), fNext(next), fKey(key)
{
}
+ ValueHashTableBucketElem(){};
TVal fData;
ValueHashTableBucketElem<TVal>* fNext;
void* fKey;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueHashTableBucketElem(const ValueHashTableBucketElem<TVal>&);
+ ValueHashTableBucketElem<TVal>& operator=(const ValueHashTableBucketElem<TVal>&);
};
@@ -151,6 +159,11 @@
friend class ValueHashTableOfEnumerator<TVal>;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueHashTableOf(const ValueHashTableOf<TVal>&);
+ ValueHashTableOf<TVal>& operator=(const ValueHashTableOf<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -187,7 +200,7 @@
// An enumerator for a value array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TVal> class ValueHashTableOfEnumerator : public XMLEnumerator<TVal>
+template <class TVal> class ValueHashTableOfEnumerator : public XMLEnumerator<TVal>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -213,6 +226,12 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueHashTableOfEnumerator(const ValueHashTableOfEnumerator<TVal>&);
+ ValueHashTableOfEnumerator<TVal>& operator=(const ValueHashTableOfEnumerator<TVal>&);
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
1.7 +16 -1 xml-xerces/c/src/xercesc/util/ValueStackOf.hpp
Index: ValueStackOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueStackOf.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValueStackOf.hpp 29 May 2003 13:26:44 -0000 1.6
+++ ValueStackOf.hpp 29 Jan 2004 11:48:46 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/05/29 13:26:44 knoaman
* Fix memory leak when using deprecated dom.
*
@@ -142,6 +145,12 @@
private :
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueStackOf(const ValueStackOf<TElem>&);
+ ValueStackOf<TElem>& operator=(const ValueStackOf<TElem>&);
+
+ // -----------------------------------------------------------------------
// Declare our friends
// -----------------------------------------------------------------------
friend class ValueStackEnumerator<TElem>;
@@ -163,7 +172,7 @@
// An enumerator for a value stack. It derives from the basic enumerator
// class, so that value stacks can be generically enumerated.
//
-template <class TElem> class ValueStackEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class ValueStackEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -186,6 +195,12 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueStackEnumerator(const ValueStackEnumerator<TElem>&);
+ ValueStackEnumerator<TElem>& operator=(const ValueStackEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
1.8 +10 -1 xml-xerces/c/src/xercesc/util/ValueVectorOf.hpp
Index: ValueVectorOf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueVectorOf.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ValueVectorOf.hpp 29 May 2003 13:26:44 -0000 1.7
+++ ValueVectorOf.hpp 29 Jan 2004 11:48:46 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/05/29 13:26:44 knoaman
* Fix memory leak when using deprecated dom.
*
@@ -190,7 +193,7 @@
// An enumerator for a value vector. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class ValueVectorEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class ValueVectorEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -213,6 +216,12 @@
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueVectorEnumerator(const ValueVectorEnumerator<TElem>&);
+ ValueVectorEnumerator<TElem>& operator=(const ValueVectorEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
1.26 +7 -5 xml-xerces/c/src/xercesc/util/XMLAbstractDoubleFloat.cpp
Index: XMLAbstractDoubleFloat.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLAbstractDoubleFloat.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XMLAbstractDoubleFloat.cpp 13 Jan 2004 19:50:56 -0000 1.25
+++ XMLAbstractDoubleFloat.cpp 29 Jan 2004 11:48:46 -0000 1.26
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.26 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.25 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -356,7 +359,7 @@
if ((lValue->isSpecialValue()) &&
(!rValue->isSpecialValue()) )
{
- return compareSpecial(lValue, rValue, manager);
+ return compareSpecial(lValue, manager);
}
//
// case#4: lValue normal
@@ -364,14 +367,13 @@
//
else
{
- return (-1) * compareSpecial(rValue, lValue, manager);
+ return (-1) * compareSpecial(rValue, manager);
}
return 0;
}
-int XMLAbstractDoubleFloat::compareSpecial(const XMLAbstractDoubleFloat* const specialValue
- , const XMLAbstractDoubleFloat* const normalValue
+int XMLAbstractDoubleFloat::compareSpecial(const XMLAbstractDoubleFloat* const specialValue
, MemoryManager* const manager)
{
switch (specialValue->fType)
1.20 +5 -3 xml-xerces/c/src/xercesc/util/XMLAbstractDoubleFloat.hpp
Index: XMLAbstractDoubleFloat.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLAbstractDoubleFloat.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLAbstractDoubleFloat.hpp 13 Jan 2004 19:50:56 -0000 1.19
+++ XMLAbstractDoubleFloat.hpp 29 Jan 2004 11:48:46 -0000 1.20
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.20 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.19 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -260,8 +263,7 @@
inline bool isSpecialValue() const;
- static int compareSpecial(const XMLAbstractDoubleFloat* const specialValue
- , const XMLAbstractDoubleFloat* const normalValue
+ static int compareSpecial(const XMLAbstractDoubleFloat* const specialValue
, MemoryManager* const manager);
void formatString();
1.12 +6 -1 xml-xerces/c/src/xercesc/util/XMLBigInteger.hpp
Index: XMLBigInteger.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLBigInteger.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLBigInteger.hpp 17 Dec 2003 00:18:35 -0000 1.11
+++ XMLBigInteger.hpp 29 Jan 2004 11:48:46 -0000 1.12
@@ -152,6 +152,11 @@
int intValue() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLBigInteger& operator=(const XMLBigInteger&);
+
void setSign(int);
1.4 +7 -1 xml-xerces/c/src/xercesc/util/XMLChar.cpp
Index: XMLChar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLChar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLChar.cpp 23 Dec 2002 18:57:46 -0000 1.3
+++ XMLChar.cpp 29 Jan 2004 11:48:46 -0000 1.4
@@ -8922,6 +8922,12 @@
initCharFlagTable();
initCharFlagTable1_1();
}
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented methods.
+ // -----------------------------------------------------------------------
+ CharFlagKicker(const CharFlagKicker&);
+ CharFlagKicker& operator=(const CharFlagKicker&);
};
static CharFlagKicker gKicker;
1.3 +13 -0 xml-xerces/c/src/xercesc/util/XMLChar.hpp
Index: XMLChar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLChar.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLChar.hpp 14 Aug 2003 02:57:27 -0000 1.2
+++ XMLChar.hpp 29 Jan 2004 11:48:47 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/08/14 02:57:27 knoaman
* Code refactoring to improve performance of validation.
*
@@ -154,6 +157,11 @@
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLChar1_0();
+
+ // -----------------------------------------------------------------------
// Static data members
//
// fgCharCharsTable1_0
@@ -307,6 +315,11 @@
static bool isPublicIdChar(const XMLCh toCheck, const XMLCh toCheck2 = 0);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLChar1_1();
+
// -----------------------------------------------------------------------
// Static data members
//
1.4 +2 -2 xml-xerces/c/src/xercesc/util/XMLChTranscoder.cpp
Index: XMLChTranscoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLChTranscoder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLChTranscoder.cpp 17 Dec 2003 00:18:35 -0000 1.3
+++ XMLChTranscoder.cpp 29 Jan 2004 11:48:47 -0000 1.4
@@ -127,7 +127,7 @@
, XMLByte* const toFill
, const unsigned int maxBytes
, unsigned int& charsEaten
- , const UnRepOpts options)
+ , const UnRepOpts)
{
// If debugging, make sure that the block size is legal
#if defined(XERCES_DEBUG)
@@ -158,7 +158,7 @@
}
-bool XMLChTranscoder::canTranscodeTo(const unsigned int toCheck) const
+bool XMLChTranscoder::canTranscodeTo(const unsigned int) const
{
// We can handle anything
return true;
1.25 +9 -6 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XMLDateTime.cpp 25 Jan 2004 23:23:26 -0000 1.24
+++ XMLDateTime.cpp 29 Jan 2004 11:48:47 -0000 1.25
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.25 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.24 2004/01/25 23:23:26 jberry
* Step around CodeWarrior compiler warning
*
@@ -402,8 +405,8 @@
fNewDate->fValue[utc] = UTC_STD;
}
-int XMLDateTime::compareResult(short resultA
- , short resultB
+int XMLDateTime::compareResult(int resultA
+ , int resultB
, bool strict)
{
@@ -446,7 +449,7 @@
return XMLDateTime::compareOrder(pDate1, pDate2);
}
- short c1, c2;
+ int c1, c2;
if ( pDate1->isNormalized())
{
@@ -1540,8 +1543,8 @@
// (-?) cc+yy-mm-dd'T'hh:mm:ss'Z' ('.'s+)?
// 2+ 8 1 8 1
//
- int additionalLen = 0;
- if (0 != (additionalLen = fillYearString(retPtr, CentYear)))
+ int additionalLen = fillYearString(retPtr, CentYear);
+ if(additionalLen != 0)
{
// very bad luck; have to resize the buffer...
XMLCh *tmpBuf = (XMLCh*) toUse->allocate( (additionalLen+21+miliSecondsLen +2) * sizeof(XMLCh));
1.17 +6 -3 xml-xerces/c/src/xercesc/util/XMLDateTime.hpp
Index: XMLDateTime.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDateTime.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLDateTime.hpp 13 Jan 2004 19:50:56 -0000 1.16
+++ XMLDateTime.hpp 29 Jan 2004 11:48:47 -0000 1.17
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.17 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.16 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -253,8 +256,8 @@
// -----------------------------------------------------------------------
// Comparison
// -----------------------------------------------------------------------
- static int compareResult(short
- , short
+ static int compareResult(int
+ , int
, bool);
static void addDuration(XMLDateTime* pDuration
1.4 +4 -1 xml-xerces/c/src/xercesc/util/XMLDeleterFor.hpp
Index: XMLDeleterFor.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDeleterFor.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDeleterFor.hpp 7 Mar 2003 18:11:55 -0000 1.3
+++ XMLDeleterFor.hpp 29 Jan 2004 11:48:47 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/03/07 18:11:55 tng
* Return a reference instead of void for operator=
*
@@ -110,7 +113,7 @@
// -----------------------------------------------------------------------
XMLDeleterFor();
XMLDeleterFor(const XMLDeleterFor<T>&);
- XMLDeleterFor& operator=(const XMLDeleterFor<T>&);
+ XMLDeleterFor<T>& operator=(const XMLDeleterFor<T>&);
// -----------------------------------------------------------------------
1.6 +6 -0 xml-xerces/c/src/xercesc/util/XMLDOMMsg.hpp
Index: XMLDOMMsg.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDOMMsg.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLDOMMsg.hpp 14 May 2003 18:10:41 -0000 1.5
+++ XMLDOMMsg.hpp 29 Jan 2004 11:48:47 -0000 1.6
@@ -79,6 +79,12 @@
return DOMError::DOM_SEVERITY_FATAL_ERROR;
else return DOMError::DOM_SEVERITY_ERROR;
}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLDOMMsg();
};
XERCES_CPP_NAMESPACE_END
1.4 +12 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLEnumerator.hpp 4 Nov 2002 15:22:05 -0000 1.3
+++ XMLEnumerator.hpp 29 Jan 2004 11:48:47 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2002/11/04 15:22:05 tng
* C++ Namespace Support.
*
@@ -106,6 +109,15 @@
virtual bool hasMoreElements() const = 0;
virtual TElem& nextElement() = 0;
virtual void Reset() = 0;
+
+ XMLEnumerator() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLEnumerator(const XMLEnumerator<TElem>&);
+ XMLEnumerator<TElem>& operator=(const XMLEnumerator<TElem>&);
};
XERCES_CPP_NAMESPACE_END
1.12 +3 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLException.cpp 9 Jan 2004 04:39:56 -0000 1.11
+++ XMLException.cpp 29 Jan 2004 11:48:47 -0000 1.12
@@ -209,10 +209,9 @@
fCode(toCopy.fCode)
, fSrcFile(0)
, fSrcLine(toCopy.fSrcLine)
- , fMemoryManager(toCopy.fMemoryManager)
+ , fMsg(XMLString::replicate(toCopy.fMsg, toCopy.fMemoryManager))
+ , fMemoryManager(toCopy.fMemoryManager)
{
- fMsg = XMLString::replicate(toCopy.fMsg, fMemoryManager);
-
if (toCopy.fSrcFile) {
fSrcFile = XMLString::replicate
(
1.18 +5 -0 xml-xerces/c/src/xercesc/util/XMLExceptMsgs.hpp
Index: XMLExceptMsgs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLExceptMsgs.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XMLExceptMsgs.hpp 29 Oct 2003 16:24:31 -0000 1.17
+++ XMLExceptMsgs.hpp 29 Jan 2004 11:48:47 -0000 1.18
@@ -412,6 +412,11 @@
, E_HighBounds = 396
};
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLExcepts();
};
XERCES_CPP_NAMESPACE_END
1.4 +9 -1 xml-xerces/c/src/xercesc/util/XMLInteger.hpp
Index: XMLInteger.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLInteger.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLInteger.hpp 15 May 2003 19:07:46 -0000 1.3
+++ XMLInteger.hpp 29 Jan 2004 11:48:47 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/15 19:07:46 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -98,6 +101,11 @@
int intValue() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLInteger(const XMLInteger&);
+ XMLInteger& operator=(const XMLInteger&);
// -----------------------------------------------------------------------
// Private data members
1.5 +5 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLNumber.cpp 17 Oct 2003 21:10:55 -0000 1.4
+++ XMLNumber.cpp 29 Jan 2004 11:48:47 -0000 1.5
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/10/17 21:10:55 peiyongz
* loadNumber() added
*
@@ -104,7 +107,7 @@
IMPL_XSERIALIZABLE_NOCREATE(XMLNumber)
-void XMLNumber::serialize(XSerializeEngine& serEng)
+void XMLNumber::serialize(XSerializeEngine&)
{
// this class has no data to serialize/de-serilize
}
1.13 +10 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLNumber.hpp 13 Jan 2004 19:50:56 -0000 1.12
+++ XMLNumber.hpp 29 Jan 2004 11:48:47 -0000 1.13
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -178,6 +181,12 @@
XMLNumber();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLNumber(const XMLNumber&);
+ XMLNumber& operator=(const XMLNumber&);
};
XERCES_CPP_NAMESPACE_END
1.3 +9 -7 xml-xerces/c/src/xercesc/util/XMLRegisterCleanup.hpp
Index: XMLRegisterCleanup.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLRegisterCleanup.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLRegisterCleanup.hpp 4 Nov 2002 15:22:05 -0000 1.2
+++ XMLRegisterCleanup.hpp 29 Jan 2004 11:48:47 -0000 1.3
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2002/11/04 15:22:05 tng
* C++ Namespace Support.
*
@@ -180,12 +183,11 @@
}
private:
-
- //
- // unsupported ctor and operator
- //
- XMLRegisterCleanup(const XMLRegisterCleanup&)
- {}
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLRegisterCleanup(const XMLRegisterCleanup&);
+ XMLRegisterCleanup& operator=(const XMLRegisterCleanup&);
// This is the cleanup function to be called
XMLCleanupFn m_cleanupFn;
1.3 +9 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLResourceIdentifier.hpp 25 Nov 2003 18:16:38 -0000 1.2
+++ XMLResourceIdentifier.hpp 29 Jan 2004 11:48:47 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/11/25 18:16:38 knoaman
* Documentation update. Thanks to David Cargill.
*
@@ -233,12 +236,12 @@
, const XMLCh* const systemId
, const XMLCh* const nameSpace
, const XMLCh* const publicId
- , const XMLCh* const baseURI ) :
- fResourceIdentifierType(resourceIdentifierType),
- fSystemId(systemId),
- fNameSpace(nameSpace),
- fPublicId(publicId),
- fBaseURI(baseURI)
+ , const XMLCh* const baseURI )
+ : fResourceIdentifierType(resourceIdentifierType)
+ , fPublicId(publicId)
+ , fSystemId(systemId)
+ , fBaseURI(baseURI)
+ , fNameSpace(nameSpace)
{
}
1.8 +6 -4 xml-xerces/c/src/xercesc/util/XMLStringTokenizer.cpp
Index: XMLStringTokenizer.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLStringTokenizer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLStringTokenizer.cpp 17 Dec 2003 00:18:35 -0000 1.7
+++ XMLStringTokenizer.cpp 29 Jan 2004 11:48:47 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -107,13 +110,11 @@
: fOffset(0)
, fStringLen(XMLString::stringLen(srcStr))
, fString(XMLString::replicate(srcStr, manager))
+ , fDelimeters(XMLString::replicate(fgDelimeters, manager))
, fTokens(0)
, fMemoryManager(manager)
{
try {
-
- fDelimeters = XMLString::replicate(fgDelimeters, fMemoryManager);
-
if (fStringLen > 0) {
fTokens = new (fMemoryManager) RefArrayVectorOf<XMLCh>(4, true, fMemoryManager);
}
@@ -133,12 +134,13 @@
: fOffset(0)
, fStringLen(XMLString::stringLen(srcStr))
, fString(XMLString::replicate(srcStr, manager))
+ , fDelimeters(XMLString::replicate(delim, fMemoryManager))
, fTokens(0)
, fMemoryManager(manager)
{
try {
- fDelimeters = XMLString::replicate(delim, fMemoryManager);
+
if (fStringLen > 0) {
fTokens = new (fMemoryManager) RefArrayVectorOf<XMLCh>(4, true, fMemoryManager);
1.6 +7 -1 xml-xerces/c/src/xercesc/util/XMLStringTokenizer.hpp
Index: XMLStringTokenizer.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLStringTokenizer.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLStringTokenizer.hpp 1 Dec 2003 23:23:27 -0000 1.5
+++ XMLStringTokenizer.hpp 29 Jan 2004 11:48:47 -0000 1.6
@@ -164,6 +164,12 @@
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLStringTokenizer(const XMLStringTokenizer&);
+ XMLStringTokenizer& operator=(const XMLStringTokenizer&);
+
+ // -----------------------------------------------------------------------
// CleanUp methods
// -----------------------------------------------------------------------
void cleanUp();
1.4 +2 -2 xml-xerces/c/src/xercesc/util/XMLUCSTranscoder.cpp
Index: XMLUCSTranscoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUCSTranscoder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLUCSTranscoder.cpp 17 Dec 2003 00:18:35 -0000 1.3
+++ XMLUCSTranscoder.cpp 29 Jan 2004 11:48:47 -0000 1.4
@@ -187,7 +187,7 @@
, XMLByte* const toFill
, const unsigned int maxBytes
, unsigned int& charsEaten
- , const UnRepOpts options)
+ , const UnRepOpts)
{
// If debugging, make sure that the block size is legal
#if defined(XERCES_DEBUG)
@@ -279,7 +279,7 @@
}
-bool XMLUCS4Transcoder::canTranscodeTo(const unsigned int toCheck) const
+bool XMLUCS4Transcoder::canTranscodeTo(const unsigned int) const
{
// We can handle anything
return true;
1.33 +7 -1 xml-xerces/c/src/xercesc/util/XMLUni.hpp
Index: XMLUni.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.hpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XMLUni.hpp 25 Nov 2003 03:46:26 -0000 1.32
+++ XMLUni.hpp 29 Jan 2004 11:48:47 -0000 1.33
@@ -295,6 +295,12 @@
// Locale
static const char fgXercescDefaultLocale[];
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLUni();
};
XERCES_CPP_NAMESPACE_END
1.4 +2 -2 xml-xerces/c/src/xercesc/util/XMLUTF16Transcoder.cpp
Index: XMLUTF16Transcoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUTF16Transcoder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLUTF16Transcoder.cpp 17 Dec 2003 00:18:35 -0000 1.3
+++ XMLUTF16Transcoder.cpp 29 Jan 2004 11:48:47 -0000 1.4
@@ -168,7 +168,7 @@
, XMLByte* const toFill
, const unsigned int maxBytes
, unsigned int& charsEaten
- , const UnRepOpts options)
+ , const UnRepOpts)
{
// If debugging, make sure that the block size is legal
#if defined(XERCES_DEBUG)
@@ -236,7 +236,7 @@
}
-bool XMLUTF16Transcoder::canTranscodeTo(const unsigned int toCheck) const
+bool XMLUTF16Transcoder::canTranscodeTo(const unsigned int) const
{
// We can handle anything
return true;
1.7 +7 -7 xml-xerces/c/src/xercesc/util/XMLUTF8Transcoder.cpp
Index: XMLUTF8Transcoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUTF8Transcoder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLUTF8Transcoder.cpp 13 Jan 2004 16:34:20 -0000 1.6
+++ XMLUTF8Transcoder.cpp 29 Jan 2004 11:48:47 -0000 1.7
@@ -218,7 +218,7 @@
// first, test first byte
if((gUTFByteIndicatorTest[trailingBytes] & *srcPtr) != gUTFByteIndicator[trailingBytes]) {
char pos[2] = {(char)0x31, 0};
- char len[2] = {(char)trailingBytes+0x31, 0};
+ char len[2] = {(char)(trailingBytes+0x31), 0};
char byte[2] = {*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, pos, byte, len, getMemoryManager());
}
@@ -234,8 +234,8 @@
}
else
{
- char len[2] = {(char)trailingBytes+0x31, 0};
- char pos[2]= {(char)i+0x31, 0};
+ char len[2] = {(char)(trailingBytes+0x31), 0};
+ char pos[2]= {(char)(i+0x31), 0};
char byte[2] = {*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, pos, byte, len, getMemoryManager());
}
@@ -246,7 +246,7 @@
}
else
{
- char len[2] = {(char)trailingBytes+0x31, 0};
+ char len[2] = {(char)(trailingBytes+0x31), 0};
char byte[2] = {*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, len, byte, len, getMemoryManager());
}
@@ -298,12 +298,12 @@
*outPtr++ = XMLCh((tmpVal >> 10) + 0xD800);
//
- // And then the treailing char. This one accounts for no
+ // And then the trailing char. This one accounts for no
// bytes eaten from the source, so set the char size for this
// one to be zero.
//
*sizePtr++ = 0;
- *outPtr++ = XMLCh(tmpVal & 0x3FF) + 0xDC00;
+ *outPtr++ = XMLCh((tmpVal & 0x3FF) + 0xDC00);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org