neilg 2003/07/14 11:51:05
Modified: c/src/xercesc/util XMemory.cpp XMemory.hpp
Log:
part of the patch to bug 20353; thanks to Vitaly Prapirny and Anthon Pang.
Revision Changes Path
1.7 +2 -2 xml-xerces/c/src/xercesc/util/XMemory.cpp
Index: XMemory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMemory.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMemory.cpp 26 May 2003 21:47:47 -0000 1.6
+++ XMemory.cpp 14 Jul 2003 18:51:05 -0000 1.7
@@ -110,7 +110,7 @@
}
//The HP compiler is complaining about duplicate overloading of delete
-#if !defined(XML_HPUX)
+#if !defined(XML_HPUX) && !defined(XML_BORLAND)
void XMemory::operator delete(void* p, MemoryManager* manager)
{
1.4 +8 -2 xml-xerces/c/src/xercesc/util/XMemory.hpp
Index: XMemory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMemory.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMemory.hpp 3 Jun 2003 19:04:38 -0000 1.3
+++ XMemory.hpp 14 Jul 2003 18:51:05 -0000 1.4
@@ -109,7 +109,7 @@
void operator delete(void* p);
//The HP compiler is complaining about duplicate overloading of delete
-#if !defined(XML_HPUX)
+#if !defined(XML_HPUX) && !defined(XML_BORLAND)
/**
* This method provide a matching delete for the placement new
*
@@ -139,6 +139,12 @@
{
}
//@}
+
+#if defined(XML_BORLAND)
+ virtual ~XMemory()
+ {
+ }
+#endif
private:
// -----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
