gareth 2003/10/20 04:46:28
Modified: c/src/xercesc/validators/DTD DTDAttDefList.cpp
DTDAttDefList.hpp
c/src/xercesc/validators/schema SchemaAttDefList.cpp
SchemaAttDefList.hpp
Log:
Pass in memory manager to constructors and use for creation of enumerators.
Revision Changes Path
1.5 +10 -6 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.cpp
Index: DTDAttDefList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTDAttDefList.cpp 17 Oct 2003 21:14:30 -0000 1.4
+++ DTDAttDefList.cpp 20 Oct 2003 11:46:28 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/10/20 11:46:28 gareth
+ * Pass in memory manager to constructors and use for creation of enumerators.
+ *
* Revision 1.4 2003/10/17 21:14:30 peiyongz
* using XTemplateSerializer
*
@@ -89,7 +92,6 @@
// Includes
// ---------------------------------------------------------------------------
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
-
#include <xercesc/internal/XTemplateSerializer.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -97,11 +99,12 @@
// ---------------------------------------------------------------------------
// DTDAttDefList: Constructors and Destructor
// ---------------------------------------------------------------------------
-DTDAttDefList::DTDAttDefList(RefHashTableOf<DTDAttDef>* const listToUse)
-:fEnum(0)
+DTDAttDefList::DTDAttDefList(RefHashTableOf<DTDAttDef>* const listToUse,
MemoryManager* const manager)
+: XMLAttDefList(manager)
+,fEnum(0)
,fList(listToUse)
{
- fEnum = new RefHashTableOfEnumerator<DTDAttDef>(listToUse);
+ fEnum = new (getMemoryManager()) RefHashTableOfEnumerator<DTDAttDef>(listToUse);
}
DTDAttDefList::~DTDAttDefList()
@@ -203,7 +206,7 @@
if (!fEnum && fList)
{
- fEnum = new RefHashTableOfEnumerator<DTDAttDef>(fList);
+ fEnum = new (getMemoryManager())
RefHashTableOfEnumerator<DTDAttDef>(fList);
}
}
@@ -211,7 +214,8 @@
DTDAttDefList::DTDAttDefList(MemoryManager* const manager)
-:fEnum(0)
+: XMLAttDefList(manager)
+,fEnum(0)
,fList(0)
{
}
1.5 +5 -1 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.hpp
Index: DTDAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTDAttDefList.hpp 10 Oct 2003 16:24:51 -0000 1.4
+++ DTDAttDefList.hpp 20 Oct 2003 11:46:28 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/10/20 11:46:28 gareth
+ * Pass in memory manager to constructors and use for creation of enumerators.
+ *
* Revision 1.4 2003/10/10 16:24:51 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -116,7 +119,8 @@
// -----------------------------------------------------------------------
DTDAttDefList
(
- RefHashTableOf<DTDAttDef>* const listToUse
+ RefHashTableOf<DTDAttDef>* const listToUse,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
~DTDAttDefList();
1.6 +8 -4 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.cpp
Index: SchemaAttDefList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SchemaAttDefList.cpp 17 Oct 2003 21:17:12 -0000 1.5
+++ SchemaAttDefList.cpp 20 Oct 2003 11:46:28 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/10/20 11:46:28 gareth
+ * Pass in memory manager to constructors and use for creation of enumerators.
+ *
* Revision 1.5 2003/10/17 21:17:12 peiyongz
* using XTemplateSerializer
*
@@ -92,11 +95,12 @@
// ---------------------------------------------------------------------------
// SchemaAttDefList: Constructors and Destructor
// ---------------------------------------------------------------------------
-SchemaAttDefList::SchemaAttDefList(RefHash2KeysTableOf<SchemaAttDef>* const
listToUse)
-:fEnum(0)
+SchemaAttDefList::SchemaAttDefList(RefHash2KeysTableOf<SchemaAttDef>* const
listToUse, MemoryManager* const manager)
+: XMLAttDefList(manager)
+,fEnum(0)
,fList(listToUse)
{
- fEnum = new RefHash2KeysTableOfEnumerator<SchemaAttDef>(listToUse);
+ fEnum = new (getMemoryManager())
RefHash2KeysTableOfEnumerator<SchemaAttDef>(listToUse);
}
SchemaAttDefList::~SchemaAttDefList()
@@ -200,7 +204,7 @@
if (!fEnum && fList)
{
- fEnum = new RefHash2KeysTableOfEnumerator<SchemaAttDef>(fList);
+ fEnum = new (getMemoryManager())
RefHash2KeysTableOfEnumerator<SchemaAttDef>(fList);
}
}
1.5 +5 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.hpp
Index: SchemaAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SchemaAttDefList.hpp 10 Oct 2003 16:25:40 -0000 1.4
+++ SchemaAttDefList.hpp 20 Oct 2003 11:46:28 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/10/20 11:46:28 gareth
+ * Pass in memory manager to constructors and use for creation of enumerators.
+ *
* Revision 1.4 2003/10/10 16:25:40 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -106,7 +109,8 @@
// -----------------------------------------------------------------------
SchemaAttDefList
(
- RefHash2KeysTableOf<SchemaAttDef>* const listToUse
+ RefHash2KeysTableOf<SchemaAttDef>* const listToUse,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
~SchemaAttDefList();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
