cargilld 2003/12/19 15:02:25
Modified: c/src/xercesc/util ValueArrayOf.c XMLException.hpp
c/src/xercesc/util/Platforms/FreeBSD
FreeBSDPlatformUtils.cpp
c/src/xercesc/util/Platforms/IRIX IRIXPlatformUtils.cpp
c/src/xercesc/validators/datatype
DateTimeDatatypeValidator.cpp DateTimeValidator.cpp
DecimalDatatypeValidator.cpp
DecimalDatatypeValidator.hpp
FloatDatatypeValidator.cpp
FloatDatatypeValidator.hpp
TimeDatatypeValidator.cpp
Log:
More memory management updates.
Revision Changes Path
1.6 +6 -3 xml-xerces/c/src/xercesc/util/ValueArrayOf.c
Index: ValueArrayOf.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/ValueArrayOf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValueArrayOf.c 17 Dec 2003 00:18:35 -0000 1.5
+++ ValueArrayOf.c 19 Dec 2003 23:02:25 -0000 1.6
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.6 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.5 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.
*
@@ -151,7 +154,7 @@
operator[](const unsigned int index)
{
if (index >= fSize)
- ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException,
XMLExcepts::Array_BadIndex);
+ ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException,
XMLExcepts::Array_BadIndex, fMemoryManager);
return fArray[index];
}
@@ -159,7 +162,7 @@
operator[](const unsigned int index) const
{
if (index >= fSize)
- ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException,
XMLExcepts::Array_BadIndex);
+ ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException,
XMLExcepts::Array_BadIndex, fMemoryManager);
return fArray[index];
}
@@ -255,7 +258,7 @@
return;
if (newSize < fSize)
- ThrowXMLwithMemMgr(IllegalArgumentException, XMLExcepts::Array_BadNewSize);
+ ThrowXMLwithMemMgr(IllegalArgumentException, XMLExcepts::Array_BadNewSize,
fMemoryManager);
// Allocate the new array
TElem* newArray = (TElem*) fMemoryManager->allocate
1.7 +4 -4 xml-xerces/c/src/xercesc/util/XMLException.hpp
Index: XMLException.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLException.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLException.hpp 17 Dec 2003 00:18:35 -0000 1.6
+++ XMLException.hpp 19 Dec 2003 23:02:25 -0000 1.7
@@ -298,11 +298,11 @@
#define ThrowXML(type,code) throw type(__FILE__, __LINE__, code)
-#define ThrowXML1(type,code,p1) throw type(__FILE__, __LINE__, code, p1, 0, 0, 0)
+#define ThrowXML1(type,code,p1) throw type(__FILE__, __LINE__, code, p1)
-#define ThrowXML2(type,code,p1,p2) throw type(__FILE__, __LINE__, code, p1, p2, 0,
0)
+#define ThrowXML2(type,code,p1,p2) throw type(__FILE__, __LINE__, code, p1, p2)
-#define ThrowXML3(type,code,p1,p2,p3) throw type(__FILE__, __LINE__, code, p1, p2,
p3, 0)
+#define ThrowXML3(type,code,p1,p2,p3) throw type(__FILE__, __LINE__, code, p1, p2,
p3)
#define ThrowXML4(type,code,p1,p2,p3,p4) throw type(__FILE__, __LINE__, code, p1,
p2, p3, p4)
1.18 +12 -8
xml-xerces/c/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
Index: FreeBSDPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FreeBSDPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.17
+++ FreeBSDPlatformUtils.cpp 19 Dec 2003 23:02:25 -0000 1.18
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.18 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.17 2003/12/17 15:16:10 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -316,8 +319,8 @@
, MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
const char* tmpFileName = XMLString::transcode(fileName, manager);
ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FileHandle)fopen( tmpFileName , "r" );
@@ -328,8 +331,8 @@
, MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
FileHandle retVal = (FileHandle)fopen( fileName , "r" );
return retVal;
}
@@ -338,8 +341,8 @@
, MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
const char* tmpFileName = XMLString::transcode(fileName, manager);
ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "w" );
@@ -349,8 +352,8 @@
, MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
return fopen( fileName , "w" );
}
1.16 +5 -1
xml-xerces/c/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp
Index: IRIXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- IRIXPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.15
+++ IRIXPlatformUtils.cpp 19 Dec 2003 23:02:25 -0000 1.16
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.15 2003/12/17 15:16:10 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -318,7 +321,7 @@
// Seek to the end and save that value for return
if (fseek((FILE*) theFile, 0, SEEK_END))
- ThrowXML(XMLPlatformUtilsException,
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotSeekToEnd, manager);
long int retVal = ftell((FILE*)theFile);
1.13 +6 -2
xml-xerces/c/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp
Index: DateTimeDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DateTimeDatatypeValidator.cpp 17 Dec 2003 00:18:38 -0000 1.12
+++ DateTimeDatatypeValidator.cpp 19 Dec 2003 23:02:25 -0000 1.13
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.12 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -185,7 +188,8 @@
temp->checkContent(rawData, 0, false, toUse);
//Have the fDateTime to do the job
- return fDateTime->getDateTimeCanonicalRepresentation(toUse);
+ XMLDateTime aDateTime(rawData, toUse);
+ return aDateTime.getDateTimeCanonicalRepresentation(toUse);
}
/***
1.13 +18 -36
xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.cpp
Index: DateTimeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DateTimeValidator.cpp 17 Dec 2003 00:18:38 -0000 1.12
+++ DateTimeValidator.cpp 19 Dec 2003 23:02:25 -0000 1.13
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.12 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -132,8 +135,6 @@
// ---------------------------------------------------------------------------
DateTimeValidator::~DateTimeValidator()
{
- if (fDateTime)
- delete fDateTime;
}
DateTimeValidator::DateTimeValidator(
@@ -143,7 +144,6 @@
, const ValidatorType type
, MemoryManager* const manager)
:AbstractNumericFacetValidator(baseValidator, facets, finalSet, type, manager)
-, fDateTime(0)
{
//do not invoke init() here !!!
}
@@ -185,8 +185,6 @@
, bool asBase
, MemoryManager* const manager)
{
- bool deleteLazy = false;
-
//validate against base validator if any
DateTimeValidator *pBaseValidator = (DateTimeValidator*)
this->getBaseValidator();
if (pBaseValidator)
@@ -226,24 +224,17 @@
// the derived classes' parse() method constructs an
// XMLDateTime object anc invokes appropriate XMLDateTime's
// parser to parse the content.
- if (fDateTime)
- fDateTime->setBuffer(content);
- else
- {
- fDateTime = new (manager) XMLDateTime(content, manager);
- // REVISIT: cargillmem
- if (manager != fMemoryManager)
- deleteLazy = true;
- }
-
- parse(fDateTime);
+ XMLDateTime dateTimeValue(content, manager);
+ XMLDateTime* dateTime = &dateTimeValue;
+
+ parse(dateTime);
// must be < MaxExclusive
if ((thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0)
{
- if (compareValues(fDateTime, getMaxExclusive()) != XMLDateTime::LESS_THAN)
+ if (compareValues(dateTime, getMaxExclusive()) != XMLDateTime::LESS_THAN)
{
- REPORT_VALUE_ERROR( fDateTime
+ REPORT_VALUE_ERROR( dateTime
, getMaxExclusive()
, XMLExcepts::VALUE_exceed_maxExcl
, manager)
@@ -253,10 +244,10 @@
// must be <= MaxInclusive
if ((thisFacetsDefined & DatatypeValidator::FACET_MAXINCLUSIVE) != 0)
{
- int result = compareValues(fDateTime, getMaxInclusive());
+ int result = compareValues(dateTime, getMaxInclusive());
if ( result == XMLDateTime::GREATER_THAN || result ==
XMLDateTime::INDETERMINATE )
{
- REPORT_VALUE_ERROR( fDateTime
+ REPORT_VALUE_ERROR( dateTime
, getMaxInclusive()
, XMLExcepts::VALUE_exceed_maxIncl
, manager)
@@ -266,10 +257,10 @@
// must be >= MinInclusive
if ((thisFacetsDefined & DatatypeValidator::FACET_MININCLUSIVE) != 0)
{
- int result = compareValues(fDateTime, getMinInclusive());
+ int result = compareValues(dateTime, getMinInclusive());
if (result == XMLDateTime::LESS_THAN || result ==
XMLDateTime::INDETERMINATE)
{
- REPORT_VALUE_ERROR( fDateTime
+ REPORT_VALUE_ERROR( dateTime
, getMinInclusive()
, XMLExcepts::VALUE_exceed_minIncl
, manager)
@@ -279,9 +270,9 @@
// must be > MinExclusive
if ( (thisFacetsDefined & DatatypeValidator::FACET_MINEXCLUSIVE) != 0 )
{
- if (compareValues(fDateTime, getMinExclusive()) !=
XMLDateTime::GREATER_THAN)
+ if (compareValues(dateTime, getMinExclusive()) != XMLDateTime::GREATER_THAN)
{
- REPORT_VALUE_ERROR( fDateTime
+ REPORT_VALUE_ERROR( dateTime
, getMinExclusive()
, XMLExcepts::VALUE_exceed_minExcl
, manager)
@@ -295,22 +286,13 @@
int enumLength = getEnumeration()->size();
for ( ; i < enumLength; i++)
{
- if (compareValues(fDateTime, getEnumeration()->elementAt(i)) ==
XMLDateTime::EQUAL)
+ if (compareValues(dateTime, getEnumeration()->elementAt(i)) ==
XMLDateTime::EQUAL)
break;
}
if (i == enumLength)
ThrowXMLwithMemMgr1(InvalidDatatypeValueException,
XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
}
-
- if (deleteLazy)
- {
- // REVISIT: cargillmem
- // hmm.. if an exception is thrown do we cleanup...
- // no but this avoids a number of exceptions for now...
- delete fDateTime;
- fDateTime = 0;
- }
}
//
@@ -411,7 +393,7 @@
AbstractNumericFacetValidator::serialize(serEng);
- //fDateTime can be instantiated during checkContent(), so don't serialize it.
+ //dateTime can be instantiated during checkContent(), so don't serialize it.
}
XERCES_CPP_NAMESPACE_END
1.20 +17 -34
xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
Index: DecimalDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DecimalDatatypeValidator.cpp 17 Dec 2003 00:18:38 -0000 1.19
+++ DecimalDatatypeValidator.cpp 19 Dec 2003 23:02:25 -0000 1.20
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.19 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -197,7 +200,6 @@
:AbstractNumericValidator(0, 0, 0, DatatypeValidator::Decimal, manager)
, fTotalDigits(0)
, fFractionDigits(0)
-, fCompareData(0)
{
setOrdered(XSSimpleTypeDefinition::ORDERED_TOTAL);
setNumeric(true);
@@ -212,15 +214,12 @@
:AbstractNumericValidator(baseValidator, facets, finalSet,
DatatypeValidator::Decimal, manager)
, fTotalDigits(0)
, fFractionDigits(0)
-, fCompareData(0)
{
init(enums, manager);
}
DecimalDatatypeValidator::~DecimalDatatypeValidator()
{
- if (fCompareData)
- delete fCompareData;
}
// -----------------------------------------------------------------------
@@ -534,8 +533,6 @@
, bool asBase
, MemoryManager* const manager)
{
- bool deleteLazy = false;
-
//validate against base validator if any
DecimalDatatypeValidator *pBase = (DecimalDatatypeValidator*)
this->getBaseValidator();
if (pBase)
@@ -574,22 +571,16 @@
return;
try {
- if (fCompareData)
- fCompareData->setDecimalValue(content);
- else {
- // REVISIT: cargillmem
- fCompareData = new (manager) XMLBigDecimal(content, manager);
- if (manager != fMemoryManager)
- deleteLazy = true;
- }
-
+ XMLBigDecimal compareDataValue(content, manager);
+ XMLBigDecimal* compareData = &compareDataValue;
+
if (getEnumeration())
{
int i=0;
int enumLength = getEnumeration()->size();
for ( ; i < enumLength; i++)
{
- if (compareValues(fCompareData, (XMLBigDecimal*)
getEnumeration()->elementAt(i)) ==0 )
+ if (compareValues(compareData, (XMLBigDecimal*)
getEnumeration()->elementAt(i)) ==0 )
break;
}
@@ -597,17 +588,17 @@
ThrowXMLwithMemMgr1(InvalidDatatypeValueException,
XMLExcepts::VALUE_NotIn_Enumeration, content, manager);
}
- boundsCheck(fCompareData, manager);
+ boundsCheck(compareData, manager);
if ( (thisFacetsDefined & DatatypeValidator::FACET_FRACTIONDIGITS) != 0 )
{
- if ( fCompareData->getScale() > fFractionDigits )
+ if ( compareData->getScale() > fFractionDigits )
{
- XMLString::binToText(fCompareData->getScale(), value1, BUF_LEN, 10,
manager);
+ XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10,
manager);
XMLString::binToText(fFractionDigits, value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
, XMLExcepts::VALUE_exceed_fractDigit
- , fCompareData->getRawData()
+ , compareData->getRawData()
, value1
, value2
, manager);
@@ -616,13 +607,13 @@
if ( (thisFacetsDefined & DatatypeValidator::FACET_TOTALDIGITS) != 0 )
{
- if ( fCompareData->getTotalDigit() > fTotalDigits )
+ if ( compareData->getTotalDigit() > fTotalDigits )
{
- XMLString::binToText(fCompareData->getTotalDigit(), value1,
BUF_LEN, 10, manager);
+ XMLString::binToText(compareData->getTotalDigit(), value1, BUF_LEN,
10, manager);
XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
, XMLExcepts::VALUE_exceed_totalDigit
- , fCompareData->getRawData()
+ , compareData->getRawData()
, value1
, value2
, manager);
@@ -635,13 +626,13 @@
where i and n are integers such that |i| < 10^totalDigits and 0 <= n
<= totalDigits.
***/
- if ( fCompareData->getScale() > fTotalDigits )
+ if ( compareData->getScale() > fTotalDigits )
{
- XMLString::binToText(fCompareData->getScale(), value1, BUF_LEN, 10,
manager);
+ XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10,
manager);
XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
, XMLExcepts::VALUE_exceed_totalDigit
- , fCompareData->getRawData()
+ , compareData->getRawData()
, value1
, value2
, manager);
@@ -650,15 +641,7 @@
}
catch (XMLException &e)
{
- if (deleteLazy) {
- delete fCompareData;
- fCompareData = 0;
- }
ThrowXMLwithMemMgr1(InvalidDatatypeFacetException, XMLExcepts::RethrowError,
e.getMessage(), manager);
- }
- if (deleteLazy) {
- delete fCompareData;
- fCompareData = 0;
}
}
1.12 +4 -2
xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
Index: DecimalDatatypeValidator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DecimalDatatypeValidator.hpp 17 Dec 2003 00:18:38 -0000 1.11
+++ DecimalDatatypeValidator.hpp 19 Dec 2003 23:02:25 -0000 1.12
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.12 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.11 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -256,7 +259,6 @@
// -----------------------------------------------------------------------
unsigned int fTotalDigits;
unsigned int fFractionDigits;
- XMLBigDecimal* fCompareData;
};
// -----------------------------------------------------------------------
1.11 +5 -2
xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
Index: FloatDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FloatDatatypeValidator.cpp 17 Dec 2003 00:18:39 -0000 1.10
+++ FloatDatatypeValidator.cpp 19 Dec 2003 23:02:25 -0000 1.11
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.11 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.10 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -270,7 +273,7 @@
//validate against base validator if any
FloatDatatypeValidator *pBase = (FloatDatatypeValidator*)
this->getBaseValidator();
if (pBase)
- pBase->checkContent(content, context, true);
+ pBase->checkContent(content, context, true, manager);
// we check pattern first
if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
1.8 +6 -3
xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
Index: FloatDatatypeValidator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FloatDatatypeValidator.hpp 17 Dec 2003 00:18:39 -0000 1.7
+++ FloatDatatypeValidator.hpp 19 Dec 2003 23:02:25 -0000 1.8
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -197,7 +200,7 @@
virtual void setMinExclusive(const XMLCh* const);
- virtual void setEnumeration(MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager);
+ virtual void setEnumeration(MemoryManager* const manager);
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericValidator
@@ -206,7 +209,7 @@
virtual void checkContent(const XMLCh* const content
, ValidationContext* const context
, bool asBase
- , MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager);
+ , MemoryManager* const manager);
};
XERCES_CPP_NAMESPACE_END
1.13 +6 -2
xml-xerces/c/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp
Index: TimeDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TimeDatatypeValidator.cpp 17 Dec 2003 00:18:39 -0000 1.12
+++ TimeDatatypeValidator.cpp 19 Dec 2003 23:02:25 -0000 1.13
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2003/12/19 23:02:25 cargilld
+ * More memory management updates.
+ *
* Revision 1.12 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -185,7 +188,8 @@
temp->checkContent(rawData, 0, false, toUse);
//Have the fDateTime to do the job
- return fDateTime->getTimeCanonicalRepresentation(toUse);
+ XMLDateTime aDateTime(rawData, toUse);
+ return aDateTime.getTimeCanonicalRepresentation(toUse);
}
/***
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
