summaryrefslogtreecommitdiff
path: root/ace/config-hpux-11.00.h
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2000-06-16 19:27:04 +0000
committerSteve Huston <shuston@riverace.com>2000-06-16 19:27:04 +0000
commitd5a9fe4c29db298f9558b73ede4b7c2046297383 (patch)
tree2c24f9769b61927c263f7329fd3a67053dcd92a2 /ace/config-hpux-11.00.h
parent3a89b46748ccd876c7b4c4a36dc89d9f85fe3617 (diff)
downloadATCD-d5a9fe4c29db298f9558b73ede4b7c2046297383.tar.gz
ChangeLogTag:Fri Jun 16 14:24:36 2000 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace/config-hpux-11.00.h')
-rw-r--r--ace/config-hpux-11.00.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 27d33c8135f..7ad4a081567 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -75,8 +75,10 @@
// Compiler can't handle calls like foo->operator T *()
# define ACE_HAS_BROKEN_CONVERSIONS
-// Compiler supports C++ exception handling
-# define ACE_HAS_EXCEPTIONS 1
+// Compiler supports C++ exception handling. However, the user can ask for this
+// to be turned off. If so (using make exceptions=0) then this def is not set.
+// By default, it is set in wrapper_macros.GNU.
+// # define ACE_HAS_EXCEPTIONS 1
// Compiler enforces the "One Definition Rule"
# define ACE_HAS_ONE_DEFINITION_RULE
@@ -98,8 +100,12 @@
// this would change to be a #if against an appropriate value of __HP_aCC
# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
-// Compiler's 'new' throws exceptions on failure.
-# define ACE_NEW_THROWS_EXCEPTIONS
+// Compiler's 'new' throws exceptions on failure. However, if the user
+// has explicitly turned off exception handling, we can't use the ACE_NEW_*
+// macro variants that do try/catch, so don't set this.
+# if defined (ACE_HAS_EXCEPTIONS)
+# define ACE_NEW_THROWS_EXCEPTIONS
+# endif /* ACE_HAS_EXCEPTIONS */
// Compiler's template mechanism must see source code (i.e., .C files).
# define ACE_TEMPLATES_REQUIRE_SOURCE