summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-14 05:06:34 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-14 05:06:34 +0000
commitb6388cf7c5d39866817f61c45024769346e4a884 (patch)
tree6f262cfa0ad48f9b451119ad2e3942d8c9555ab5
parentc6c5f66f4a0397ff52d4ebf2ac948106f2717a89 (diff)
downloadATCD-b6388cf7c5d39866817f61c45024769346e4a884.tar.gz
added quick hack to ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR to allow
compilation with g++
-rw-r--r--ace/OS.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 2e6194879c5..3e4f100809b 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -6031,7 +6031,7 @@ private:
# define ACE_DES_FREE(POINTER,DEALLOCATOR,CLASS) \
do { POINTER->~CLASS (); DEALLOCATOR (POINTER); } while (0)
-# if !defined (ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR)
+# if !defined (ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR) && !defined (__GNUG__)
# define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
POINTER->~ T_CLASS ()
# define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
@@ -6046,7 +6046,7 @@ private:
// @@ Notice that the workaround here only eliminate the compilation errors.
// It won't fix the "real problem." If the destructor is virtual, it won't
// work corrrectly.
-//# warning Memory leak possible. The compiler needs to be fixed!!!
+// WARNING: memory leak possible. The compiler needs to be fixed!!!
# define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
POINTER -> T_CLASS T_PARAMETER ::~ T_CLASS ()