summaryrefslogtreecommitdiff
path: root/ACEXML/common
diff options
context:
space:
mode:
authorkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-10-14 00:41:15 +0000
committerkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-10-14 00:41:15 +0000
commitb043553a5d17d6da43152ded95647ace21a9090d (patch)
treed94723d825938d90f8e84ad318c0918f2caff17b /ACEXML/common
parent8074e7677733e33ce39eaf5081db0fb8421a005d (diff)
downloadATCD-b043553a5d17d6da43152ded95647ace21a9090d.tar.gz
ChangeLogTag: Sun Oct 13 19:38:35 2002 Krishnakumar B <kitty@cse.wustl.edu>
Diffstat (limited to 'ACEXML/common')
-rw-r--r--ACEXML/common/XML_Macros.h18
1 files changed, 2 insertions, 16 deletions
diff --git a/ACEXML/common/XML_Macros.h b/ACEXML/common/XML_Macros.h
index e7fe94393d7..3593a258a21 100644
--- a/ACEXML/common/XML_Macros.h
+++ b/ACEXML/common/XML_Macros.h
@@ -30,6 +30,8 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Exception_Macros.h"
+
// The following macros assume that an environment variable is passed
// in/out of each function that can throw an exception. The type of the
// environment variable is defined by ACEXML_ENV_TYPE.
@@ -64,22 +66,6 @@
#define ACEXML_DECLARE_NEW_ENV \
ACEXML_ENV_TYPE ACEXML_TRY_ENV
-// If the compiler does supports exceptions handling, make sure that native
-// exception handling is enabled. See CORBA_macros.h for tweaking this.
-#if defined (ACE_HAS_EXCEPTIONS)
-# if defined (ACE_USES_NATIVE_EXCEPTIONS)
-# if (ACE_USES_NATIVE_EXCEPTIONS == 0)
-# undef ACE_USES_NATIVE_EXCEPTIONS
-# endif /* ACE_USES_NATIVE_EXCEPTIONS == 0 */
-# else
-# define ACE_USES_NATIVE_EXCEPTIONS
-# endif /* ACE_USES_NATIVE_EXCEPTIONS */
-#else /* ! ACE_HAS_EXCEPTIONS */
-# if defined (ACE_USES_NATIVE_EXCEPTIONS)
-# undef ACE_USES_NATIVE_EXCEPTIONS
-# endif /* ACE_USES_NATIVE_EXCEPTIONS */
-#endif /* ACE_HAS_EXCEPTIONS */
-
#if defined (ACE_USES_NATIVE_EXCEPTIONS)
// -----------------------------------------------------------------