You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/05/23 22:35:07 UTC
cvs commit: xml-xerces/c/src/util/Compilers VCPPDefs.hpp
tng 01/05/23 13:35:07
Modified: c/src/util/Compilers VCPPDefs.hpp
Log:
IDOM: Move operator delete to VCPPDefs.hpp as only VCPP needs a matching delete operator.
Revision Changes Path
1.9 +27 -12 xml-xerces/c/src/util/Compilers/VCPPDefs.hpp
Index: VCPPDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Compilers/VCPPDefs.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VCPPDefs.hpp 2001/03/02 20:53:08 1.8
+++ VCPPDefs.hpp 2001/05/23 20:35:03 1.9
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log: VCPPDefs.hpp,v $
+ * Revision 1.9 2001/05/23 20:35:03 tng
+ * IDOM: Move operator delete to VCPPDefs.hpp as only VCPP needs a matching delete operator.
+ *
* Revision 1.8 2001/03/02 20:53:08 knoaman
* Schema: Regular expression - misc. updates for error messages,
* and additions of new functions to XMLString class.
@@ -158,3 +161,14 @@
#else
const char* const Xerces_DLLName = "xerces-c_" Xerces_DLLVersionStr;
#endif
+
+// ---------------------------------------------------------------------------
+// For IDOM: define a dummy delete to get rid of compiler warning:
+// no matching operator delete found; memory will not be freed if initialization throws an exception
+// ---------------------------------------------------------------------------
+class IDOM_Document;
+inline void operator delete(void* ptr, IDOM_Document *doc)
+{
+ return;
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org