peiyongz 2004/10/28 13:14:41
Modified: c/src/xercesc/util QName.hpp QName.cpp KVStringPair.hpp
KVStringPair.cpp
Log:
Data member reshuffle
Revision Changes Path
1.12 +7 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- QName.hpp 8 Sep 2004 13:56:22 -0000 1.11
+++ QName.hpp 28 Oct 2004 20:14:41 -0000 1.12
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.12 2004/10/28 20:14:41 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.11 2004/09/08 13:56:22 peiyongz
* Apache License Version 2.0
*
@@ -210,14 +213,14 @@
// fURIId
// The id of the URI that this attribute belongs to.
// -----------------------------------------------------------------------
- MemoryManager* fMemoryManager;
- XMLCh* fPrefix;
unsigned int fPrefixBufSz;
- XMLCh* fLocalPart;
unsigned int fLocalPartBufSz;
- XMLCh* fRawName;
unsigned int fRawNameBufSz;
unsigned int fURIId;
+ XMLCh* fPrefix;
+ XMLCh* fLocalPart;
+ XMLCh* fRawName;
+ MemoryManager* fMemoryManager;
};
// ---------------------------------------------------------------------------
1.14 +39 -40 xml-xerces/c/src/xercesc/util/QName.cpp
Index: QName.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/QName.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- QName.cpp 19 Oct 2004 15:08:53 -0000 1.13
+++ QName.cpp 28 Oct 2004 20:14:41 -0000 1.14
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.14 2004/10/28 20:14:41 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.13 2004/10/19 15:08:53 knoaman
* Performance improvement
*
@@ -92,32 +95,30 @@
// ---------------------------------------------------------------------------
// QName: Constructors and Destructor
// ---------------------------------------------------------------------------
-QName::QName(MemoryManager* const manager) :
-
- fMemoryManager(manager)
- , fPrefix(0)
- , fPrefixBufSz(0)
- , fLocalPart(0)
- , fLocalPartBufSz(0)
- , fRawName(0)
- , fRawNameBufSz(0)
- , fURIId(0)
+QName::QName(MemoryManager* const manager)
+:fPrefixBufSz(0)
+,fLocalPartBufSz(0)
+,fRawNameBufSz(0)
+,fURIId(0)
+,fRawName(0)
+,fPrefix(0)
+,fLocalPart(0)
+,fMemoryManager(manager)
{
}
QName::QName( const XMLCh* const prefix
, const XMLCh* const localPart
, const unsigned int uriId
- , MemoryManager* const manager) :
-
- fMemoryManager(manager)
- , fPrefix(0)
- , fPrefixBufSz(0)
- , fLocalPart(0)
- , fLocalPartBufSz(0)
- , fRawName(0)
- , fRawNameBufSz(0)
- , fURIId(0)
+ , MemoryManager* const manager)
+:fPrefixBufSz(0)
+,fLocalPartBufSz(0)
+,fRawNameBufSz(0)
+,fURIId(0)
+,fRawName(0)
+,fPrefix(0)
+,fLocalPart(0)
+,fMemoryManager(manager)
{
try
{
@@ -139,16 +140,15 @@
QName::QName( const XMLCh* const rawName
, const unsigned int uriId
- , MemoryManager* const manager) :
-
- fMemoryManager(manager)
- , fPrefix(0)
- , fPrefixBufSz(0)
- , fLocalPart(0)
- , fLocalPartBufSz(0)
- , fRawName(0)
- , fRawNameBufSz(0)
- , fURIId(0)
+ , MemoryManager* const manager)
+:fPrefixBufSz(0)
+,fLocalPartBufSz(0)
+,fRawNameBufSz(0)
+,fURIId(0)
+,fRawName(0)
+,fPrefix(0)
+,fLocalPart(0)
+,fMemoryManager(manager)
{
try
{
@@ -176,16 +176,15 @@
// ---------------------------------------------------------------------------
// QName: Copy Constructors
// ---------------------------------------------------------------------------
-QName::QName(const QName& qname) :
-
- fMemoryManager(qname.fMemoryManager)
- , fPrefix(0)
- , fPrefixBufSz(0)
- , fLocalPart(0)
- , fLocalPartBufSz(0)
- , fRawName(0)
- , fRawNameBufSz(0)
- , fURIId(0)
+QName::QName(const QName& qname)
+:fPrefixBufSz(0)
+,fLocalPartBufSz(0)
+,fRawNameBufSz(0)
+,fURIId(0)
+,fRawName(0)
+,fPrefix(0)
+,fLocalPart(0)
+,fMemoryManager(qname.fMemoryManager)
{
unsigned int newLen;
1.9 +6 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KVStringPair.hpp 8 Sep 2004 13:56:22 -0000 1.8
+++ KVStringPair.hpp 28 Oct 2004 20:14:41 -0000 1.9
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.9 2004/10/28 20:14:41 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.8 2004/09/08 13:56:22 peiyongz
* Apache License Version 2.0
*
@@ -171,11 +174,11 @@
// The amount of memory allocated for fValue.
//
// -----------------------------------------------------------------------
- MemoryManager* fMemoryManager;
- XMLCh* fKey;
unsigned long fKeyAllocSize;
- XMLCh* fValue;
unsigned long fValueAllocSize;
+ XMLCh* fKey;
+ XMLCh* fValue;
+ MemoryManager* fMemoryManager;
};
// ---------------------------------------------------------------------------
1.7 +22 -22 xml-xerces/c/src/xercesc/util/KVStringPair.cpp
Index: KVStringPair.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/KVStringPair.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KVStringPair.cpp 8 Sep 2004 13:56:22 -0000 1.6
+++ KVStringPair.cpp 28 Oct 2004 20:14:41 -0000 1.7
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.7 2004/10/28 20:14:41 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.6 2004/09/08 13:56:22 peiyongz
* Apache License Version 2.0
*
@@ -94,36 +97,33 @@
// ---------------------------------------------------------------------------
// KVStringPair: Constructors and Destructor
// ---------------------------------------------------------------------------
-KVStringPair::KVStringPair(MemoryManager* const manager) :
-
- fMemoryManager(manager)
- , fKey(0)
- , fKeyAllocSize(0)
- , fValue(0)
- , fValueAllocSize(0)
+KVStringPair::KVStringPair(MemoryManager* const manager)
+:fKeyAllocSize(0)
+,fValueAllocSize(0)
+,fKey(0)
+,fValue(0)
+,fMemoryManager(manager)
{
}
KVStringPair::KVStringPair(const XMLCh* const key,
const XMLCh* const value,
- MemoryManager* const manager) :
-
- fMemoryManager(manager)
- , fKey(0)
- , fKeyAllocSize(0)
- , fValue(0)
- , fValueAllocSize(0)
+ MemoryManager* const manager)
+:fKeyAllocSize(0)
+,fValueAllocSize(0)
+,fKey(0)
+,fValue(0)
+,fMemoryManager(manager)
{
set(key, value);
}
-KVStringPair::KVStringPair(const KVStringPair& toCopy) :
-
- fMemoryManager(toCopy.fMemoryManager)
- , fKey(0)
- , fKeyAllocSize(0)
- , fValue(0)
- , fValueAllocSize(0)
+KVStringPair::KVStringPair(const KVStringPair& toCopy)
+:fKeyAllocSize(0)
+,fValueAllocSize(0)
+,fKey(0)
+,fValue(0)
+,fMemoryManager(toCopy.fMemoryManager)
{
set(toCopy.fKey, toCopy.fValue);
}
@@ -167,7 +167,7 @@
}
void KVStringPair::set( const XMLCh* const newKey
- , const XMLCh* const newValue)
+ , const XMLCh* const newValue)
{
setKey(newKey);
setValue(newValue);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
