summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_Memory.h
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-11-21 11:01:45 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-11-21 11:01:45 +0000
commitf06a6e323348843af5c0d20faab92df5ee8ece26 (patch)
treef797eea603dc610472d38cbc3aba28759d32431a /ACE/ace/OS_Memory.h
parent878770a5da9ab6c258dbd53bf7b4db9c8bb2bd81 (diff)
downloadATCD-f06a6e323348843af5c0d20faab92df5ee8ece26.tar.gz
ChangeLogTag: Fri Nov 21 11:00:00 UTC 2008 Simon Massey <sma at prismtech dot com>
Diffstat (limited to 'ACE/ace/OS_Memory.h')
-rw-r--r--ACE/ace/OS_Memory.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h
index 68e19072eb4..365c1d2446f 100644
--- a/ACE/ace/OS_Memory.h
+++ b/ACE/ace/OS_Memory.h
@@ -231,10 +231,14 @@ ACE_END_VERSIONED_NAMESPACE_DECL
if (POINTER == 0) { errno = ENOMEM; } \
} while (0)
+# if !defined (ACE_bad_alloc)
+ class ACE_bad_alloc_class {};
+# define ACE_bad_alloc ACE_bad_alloc_class
+# endif
# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1)
-# define ACE_throw_bad_alloc AfxThrowMemoryException ()
+# define ACE_throw_bad_alloc AfxThrowMemoryException ()
# else
-# define ACE_throw_bad_alloc throw ACE_bad_alloc ()
+# define ACE_throw_bad_alloc throw ACE_bad_alloc ()
# endif
#endif /* ACE_NEW_THROWS_EXCEPTIONS */