ChangeLogTag:Mon Oct 20 16:38:12 UTC 2003 Don Hinton <dhinton@dresystems.com>

11 files changed, 46 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 39cd0b58fee..8e1a5feaf75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Mon Oct 20 16:38:12 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * bin/create_ace_build.pl:
+          Don't exclude *.exp when linking since these are the expected
+          result files for apps/gperf/tests.
+
+        * tests/New_Fail_Test:
+          Added #ifdef around unused code to remove warnings>
+
+        * ace/Auto_Event.cpp:
+        * ace/Event.cpp:
+        * ace/Lock.cpp:
+        * ace/Manual_Event.cpp:
+        * ace/Mutex.cpp:
+        * ace/RW_Mutex.cpp:
+        * ace/RW_Thread_Mutex.cpp:
+        * ace/Thread_Semaphore.cpp:
+          Added #include of the associated headers that were missing.
+          This will be needed once these files are compiled seperately via
+          MPC.  Thanks to Barry Benowitz <b.benowitz@telesciences.com> for
+          motivating this.
+
 Sun Oct 19 21:25:59 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* performance-tests/SCTP/hist.cpp: Fixed fuzz errors. Include
diff --git a/ace/Auto_Event.cpp b/ace/Auto_Event.cpp
index c0b6ba9da4b..ee217091021 100644
--- a/ace/Auto_Event.cpp
+++ b/ace/Auto_Event.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/Auto_Event.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Auto_Event.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Event.cpp b/ace/Event.cpp
index e57dd554c14..7656e51eeeb 100644
--- a/ace/Event.cpp
+++ b/ace/Event.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/Event.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Event.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Lock.cpp b/ace/Lock.cpp
index bd1d1940524..e0ea8397846 100644
--- a/ace/Lock.cpp
+++ b/ace/Lock.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/Lock.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Lock.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Manual_Event.cpp b/ace/Manual_Event.cpp
index ee9be7714c7..1bfafe0b815 100644
--- a/ace/Manual_Event.cpp
+++ b/ace/Manual_Event.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/Manual_Event.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Manual_Event.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Mutex.cpp b/ace/Mutex.cpp
index 99e99944e9a..597509e37f0 100644
--- a/ace/Mutex.cpp
+++ b/ace/Mutex.cpp
@@ -1,9 +1,13 @@
 // $Id$
 
+#include "ace/Mutex.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
+//#include "ace/Log_Msg.h"
+
 ACE_RCSID(ace, Mutex, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Mutex)
diff --git a/ace/RW_Mutex.cpp b/ace/RW_Mutex.cpp
index fd076c414dd..9da0d1199c0 100644
--- a/ace/RW_Mutex.cpp
+++ b/ace/RW_Mutex.cpp
@@ -9,6 +9,8 @@
  * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 
+#include "ace/RW_Mutex.h"
+
 #if defined (ACE_HAS_THREADS)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/RW_Thread_Mutex.cpp b/ace/RW_Thread_Mutex.cpp
index e5c66318903..19c336728e7 100644
--- a/ace/RW_Thread_Mutex.cpp
+++ b/ace/RW_Thread_Mutex.cpp
@@ -9,6 +9,8 @@
  * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 
+#include "ace/RW_Thread_Mutex.h"
+
 #if defined (ACE_HAS_THREADS)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/Thread_Semaphore.cpp b/ace/Thread_Semaphore.cpp
index 954b87e2b8c..f5efb30d27a 100644
--- a/ace/Thread_Semaphore.cpp
+++ b/ace/Thread_Semaphore.cpp
@@ -9,7 +9,7 @@
  * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 
-#include "ace/Semaphore.h"
+#include "ace/Thread_Semaphore.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/bin/create_ace_build.pl b/bin/create_ace_build.pl
index 199f3242ad1..cf89df2abf5 100755
--- a/bin/create_ace_build.pl
+++ b/bin/create_ace_build.pl
@@ -296,7 +296,6 @@ sub wanted {
         ! /^.*\.opt\z/s &&
         ! /^.*\.bak\z/s &&
         ! /^.*\.ilk\z/s &&
-        ! /^.*\.exp\z/s &&
         ! /^.*\.pdb\z/s &&
         ! /^\.cvsignore\z/s &&
         ! /^\.disable\z/s &&
diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp
index c33d67d66df..20fcc8f8ba9 100644
--- a/tests/New_Fail_Test.cpp
+++ b/tests/New_Fail_Test.cpp
@@ -30,6 +30,8 @@
 
 ACE_RCSID(tests, New_Fail_Test, "$Id$")
 
+#if (!defined (__SUNPRO_CC) && !defined (__GNUG__)) || \
+  defined (ACE_HAS_EXCEPTIONS)
 // This test allocates all of the heap memory, forcing 'new' to fail
 // because of a lack of memory.  The ACE_NEW macros should prevent an
 // exception from being thrown past the ACE_NEW.  If this test doesn't
@@ -67,6 +69,7 @@ try_ace_new_noreturn (void)
   ACE_NEW_NORETURN (p, char[BIG_BLOCK]);
   return p;
 }
+#endif /* (!__SUNPRO_CC && !__GNUG__) || ACE_HAS_EXCEPTIONS */
 
 int
 run_main (int, ACE_TCHAR *[])
@@ -85,21 +88,15 @@ run_main (int, ACE_TCHAR *[])
     ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("Out-of-memory will throw an unhandled exception\n")));
   ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("Rebuild with exceptions=1 to prevent this, but it may impair performance.\n")));
 
-  // Use the static function addresses, to prevent warnings about the
-  // functions not being used.
-  if (&try_ace_new)
-    /* NULL */;
-  if (&try_ace_new_return)
-    /* NULL */;
 #else
 
   char *blocks[MAX_ALLOCS_IN_TEST];
   int i;
 
-#if defined (ACE_HAS_EXCEPTIONS)
+#  if defined (ACE_HAS_EXCEPTIONS)
   try
     {
-#endif /* ACE_HAS_EXCEPTIONS */
+#  endif /* ACE_HAS_EXCEPTIONS */
       // First part: test ACE_NEW
       for (i = 0; i < MAX_ALLOCS_IN_TEST; i++)
         {
@@ -179,7 +176,7 @@ run_main (int, ACE_TCHAR *[])
       while (i >= 0)
         delete [] blocks[i--];
 
-#if defined (ACE_HAS_EXCEPTIONS)
+#  if defined (ACE_HAS_EXCEPTIONS)
     }
 
   catch (...)
@@ -192,7 +189,7 @@ run_main (int, ACE_TCHAR *[])
       // Mark test failure
       status = 1;
     }
-#endif /* ACE_HAS_EXCEPTIONS */
+#  endif /* ACE_HAS_EXCEPTIONS */
 #endif /* __SUNPRO_CC && !ACE_HAS_EXCEPTIONS */
 
   ACE_END_TEST;