gareth 2003/09/04 07:38:25
Modified: c/src/xercesc/dom/impl DOMErrorImpl.cpp DOMErrorImpl.hpp
Log:
Fix for bug #22008. Removed the ability to adopt the DOMObject.
Revision Changes Path
1.6 +4 -7 xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.cpp
Index: DOMErrorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMErrorImpl.cpp 14 May 2003 18:06:53 -0000 1.5
+++ DOMErrorImpl.cpp 4 Sep 2003 14:38:25 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/09/04 14:38:25 gareth
+ * Fix for bug #22008. Removed the ability to adopt the DOMObject.
+ *
* Revision 1.5 2003/05/14 18:06:53 gareth
* Updated DOMError to
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/core.html.
*
@@ -90,7 +93,6 @@
, fLocation(0)
, fType(0)
, fRelatedData(0)
-, fAdoptRelatedData(false)
{
}
@@ -103,22 +105,19 @@
, fLocation(location)
, fType(0)
, fRelatedData(0)
-, fAdoptRelatedData(false)
{
}
DOMErrorImpl::DOMErrorImpl(const short severity,
const XMLCh* type,
const XMLCh* message,
- void* relatedData,
- bool adoptRelatedData) :
+ void* relatedData) :
fAdoptLocation(false)
, fSeverity(severity)
, fMessage(message)
, fLocation(0)
, fType(type)
, fRelatedData(relatedData)
-, fAdoptRelatedData(adoptRelatedData)
{
}
@@ -127,8 +126,6 @@
{
if (fAdoptLocation)
delete fLocation;
- if(fAdoptRelatedData)
- delete fRelatedData;
}
// ---------------------------------------------------------------------------
1.8 +3 -14 xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.hpp
Index: DOMErrorImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMErrorImpl.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMErrorImpl.hpp 15 May 2003 15:56:24 -0000 1.7
+++ DOMErrorImpl.hpp 4 Sep 2003 14:38:25 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/09/04 14:38:25 gareth
+ * Fix for bug #22008. Removed the ability to adopt the DOMObject.
+ *
* Revision 1.7 2003/05/15 15:56:24 gareth
* Removed unnecessary include.
*
@@ -117,7 +120,6 @@
, const XMLCh* type
, const XMLCh* message
, void* relatedData
- , bool adoptRelatedData = false
);
/** Desctructor */
@@ -217,13 +219,6 @@
virtual void setRelatedData(void* relatedData);
- /**
- * @param value <code>true</code> if RelatedData is owned and should be
- * deleted, <code>false</code> otherwise.
- */
- void setAdoptRelatedData(bool adoptRelatedData);
- //@}
-
private :
/* Unimplemented constructors and operators */
@@ -255,8 +250,6 @@
// fRelatedData
// The data related to this error.
//
- // fAdoptRelatedData
- // Indicates whether we own the fRelatedData object or not.
// -----------------------------------------------------------------------
bool fAdoptLocation;
short fSeverity;
@@ -264,7 +257,6 @@
DOMLocator* fLocation;
const XMLCh* fType;
void* fRelatedData;
- bool fAdoptRelatedData;
};
// ---------------------------------------------------------------------------
@@ -328,9 +320,6 @@
fRelatedData = relatedData;
}
-inline void DOMErrorImpl::setAdoptRelatedData(bool adoptRelatedData) {
- fAdoptRelatedData = adoptRelatedData;
-}
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
