You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2002/04/19 07:23:32 UTC
cvs commit: xml-xalan/c/src/PlatformSupport XalanDOMStringPool.cpp XalanDOMStringPool.hpp
dbertoni 02/04/18 22:23:32
Modified: c/src/PlatformSupport XalanDOMStringPool.cpp
XalanDOMStringPool.hpp
Log:
Use new allocator class.
Revision Changes Path
1.13 +1 -5 xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.cpp
Index: XalanDOMStringPool.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XalanDOMStringPool.cpp 26 Sep 2001 21:48:05 -0000 1.12
+++ XalanDOMStringPool.cpp 19 Apr 2002 05:23:32 -0000 1.13
@@ -139,12 +139,8 @@
{
// Not found, so insert the string...
XalanDOMString* const theNewString =
- m_stringAllocator.allocateBlock();
+ m_stringAllocator.create(theString, theActualLength);
assert(theNewString != 0);
-
- new(theNewString) XalanDOMString(theString, theActualLength);
-
- m_stringAllocator.commitAllocation(theNewString);
assert(theActualLength == length(*theNewString));
1.10 +5 -11 xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.hpp
Index: XalanDOMStringPool.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanDOMStringPool.hpp 25 Sep 2001 21:12:51 -0000 1.9
+++ XalanDOMStringPool.hpp 19 Apr 2002 05:23:32 -0000 1.10
@@ -71,6 +71,7 @@
#include <PlatformSupport/ArenaAllocator.hpp>
#include <PlatformSupport/DOMStringHelper.hpp>
+#include <PlatformSupport/XalanDOMStringAllocator.hpp>
#include <PlatformSupport/XalanDOMStringHashTable.hpp>
@@ -79,20 +80,13 @@
{
public:
- enum { eDefaultBlockSize = 1024,
+ enum { eDefaultBlockSize = 32,
eDefaultBucketCount = XalanDOMStringHashTable::eDefaultBucketCount,
eDefaultBucketSize = XalanDOMStringHashTable::eDefaultBucketSize };
-#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
- typedef ArenaBlock<XalanDOMString> ArenaBlockType;
+ typedef XalanDOMStringAllocator AllocatorType;
- typedef ArenaAllocator<XalanDOMString,
- ArenaBlockType> ArenaAllocatorType;
-#else
- typedef ArenaAllocator<XalanDOMString> ArenaAllocatorType;
-#endif
-
- typedef ArenaAllocatorType::size_type block_size_type;
+ typedef AllocatorType::size_type block_size_type;
typedef size_t bucket_count_type;
typedef XalanDOMStringHashTable::bucket_size_type bucket_size_type;
@@ -172,7 +166,7 @@
operator==(const XalanDOMStringPool&) const;
// Data members...
- ArenaAllocatorType m_stringAllocator;
+ AllocatorType m_stringAllocator;
size_t m_stringCount;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org