cargilld 2003/12/17 10:35:17
Modified: c/src/xercesc/util/Platforms/Solaris
SolarisPlatformUtils.cpp
c/src/xercesc/util XMLException.cpp
Log:
Platform update for memory management so that the static memory manager (one
used to call Initialize) is only for static data.
Revision Changes Path
1.20 +4 -4
xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
Index: SolarisPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SolarisPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.19
+++ SolarisPlatformUtils.cpp 17 Dec 2003 18:35:17 -0000 1.20
@@ -208,7 +208,7 @@
int curPos = tell( (int)theFile);
if (curPos == -1)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::File_CouldNotGetSizewithMemMgr, manager);
+ XMLExcepts::File_CouldNotGetSize, manager);
return (unsigned int)curPos;
}
@@ -306,7 +306,7 @@
XMLPlatformUtils::writeBufferToFile( FileHandle const theFile
, long toWrite
, const XMLByte* const toFlush
- , MemoryManger* const manager)
+ , MemoryManager* const manager)
{
if (!theFile ||
(toWrite <= 0 ) ||
@@ -369,7 +369,7 @@
if (!retPath)
{
- ThrowXML(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotGetBasePathName, manager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotGetBasePathName, manager);
}
return XMLString::transcode(absPath, manager);
}
1.8 +4 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLException.cpp 17 Dec 2003 00:18:35 -0000 1.7
+++ XMLException.cpp 17 Dec 2003 18:35:17 -0000 1.8
@@ -212,9 +212,10 @@
fCode(toCopy.fCode)
, fSrcFile(0)
, fSrcLine(toCopy.fSrcLine)
- , fMemoryManager(toCopy.fMemoryManager)
- , fMsg(XMLString::replicate(toCopy.fMsg, fMemoryManager))
+ , fMemoryManager(toCopy.fMemoryManager)
{
+ fMsg = XMLString::replicate(toCopy.fMsg, fMemoryManager);
+
if (toCopy.fSrcFile) {
fSrcFile = XMLString::replicate
(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
