summaryrefslogtreecommitdiff
path: root/TAO/tao/orbconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/orbconf.h')
-rw-r--r--TAO/tao/orbconf.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 177a100b6d1..7ad3103640d 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -190,14 +190,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
# define TAO_NO_COPY_OCTET_SEQUENCES 1
#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-#if defined (ACE_HAS_EXCEPTIONS)
-# define TAO_HAS_EXCEPTIONS
-// TAO_USE_EXCEPTIONS is only here for backwards compatibility and
-// will go away shortly so don't use it...
-# define TAO_USE_EXCEPTIONS
-#elif (defined (TAO_HAS_EXCEPTIONS) || defined (TAO_USE_EXCEPTIONS)) && !defined (ACE_HAS_EXCEPTIONS)
-# error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
-#endif /* TAO_HAS_EXCEPTIONS */
+#define TAO_HAS_EXCEPTIONS
// BC++ seems to have a different convention for detecting Win32 than
// VC++.