ChangeLogTag:Thu Mar 16 11:51:49 2000 Darrell Brunsch <brunsch@uci.edu>

5 files changed, 38 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 65e66bc7fa3..980e5ad60f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Mar 16 11:51:49 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/MEM_SAP.i:
+        * ace/Malloc_T.cpp:
+
+          The ACE_TRACE macros were incompatible with SEH.  Conditionally
+          compiled the ACE_TRACE statements in places where this was a 
+          problem.  Thanks to Edan Ayal <edanayal@yahoo.com> for reporting
+          this.
+
 Thu Mar 16 13:40:53 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/config-sunos5.5.h: just #define ACE_USES_OLD_IOSTREAMS,
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 65e66bc7fa3..980e5ad60f6 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Thu Mar 16 11:51:49 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/MEM_SAP.i:
+        * ace/Malloc_T.cpp:
+
+          The ACE_TRACE macros were incompatible with SEH.  Conditionally
+          compiled the ACE_TRACE statements in places where this was a 
+          problem.  Thanks to Edan Ayal <edanayal@yahoo.com> for reporting
+          this.
+
 Thu Mar 16 13:40:53 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/config-sunos5.5.h: just #define ACE_USES_OLD_IOSTREAMS,
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 65e66bc7fa3..980e5ad60f6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Thu Mar 16 11:51:49 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/MEM_SAP.i:
+        * ace/Malloc_T.cpp:
+
+          The ACE_TRACE macros were incompatible with SEH.  Conditionally
+          compiled the ACE_TRACE statements in places where this was a 
+          problem.  Thanks to Edan Ayal <edanayal@yahoo.com> for reporting
+          this.
+
 Thu Mar 16 13:40:53 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/config-sunos5.5.h: just #define ACE_USES_OLD_IOSTREAMS,
diff --git a/ace/MEM_SAP.i b/ace/MEM_SAP.i
index 279a9a899dd..697e082b114 100644
--- a/ace/MEM_SAP.i
+++ b/ace/MEM_SAP.i
@@ -60,7 +60,9 @@ ACE_MEM_SAP::set_buf_len (void *buf, size_t n)
 ASYS_INLINE ssize_t
 ACE_MEM_SAP::get_buf_len (const off_t off, void *&buf)
 {
+#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
   ACE_TRACE ("ACE_MEM_SAP::get_buf_len");
+#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
   if (this->shm_malloc_ == 0)
     return -1;
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 1665f630257..4ca5600897e 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -297,7 +297,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void)
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void *
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes)
 {
+#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc");
+#endif /* !ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
   if (this->cb_ptr_ == 0)
     return 0;
@@ -432,7 +434,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::calloc (size_t nbytes,
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free (void *ap)
 {
+#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free");
+#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
   if (ap == 0 || this->cb_ptr_ == 0)
     return;
@@ -492,7 +496,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free (void *ap)
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void*
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_find (const char *name)
 {
+#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_find");
+#endif /* !ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
   if (this->cb_ptr_ == 0)
     return 0;