*** empty log message ***

3 files changed, 49 insertions, 29 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index 35319528c6e..0930aae7ad9 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,23 +1,10 @@
-Thu Apr 09 18:06:53 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* ace/High_Res_Timer.i (hrtime_to_tv): Cast the parameter for usec
- 	  to long.  It can be fixed because of Darrell's vigilance.
-
-Thu Apr 09 17:55:21 1998  Steve Huston  <shuston@riverace.com>
-
-	* ace/config-hpux-10.x.h, config-hpux11.h, config-aix-4.2.x.h:
-	  Added ACE_HAS_WILDCARD_BIND.
-
-Thu Apr 09 16:43:26 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-	* ace/ACE.*: Changed *_version() functions to be non-inlined.
-  	  After this change, inclusion of ace/Version.h can be moved into
- 	  ACE.cpp.  This change helps as all of ACE doesn't have to be
- 	  compiled after Version.h changes (Version.h changes every time a
- 	  new beta is produced).
-
 Thu Apr  9 17:31:47 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
+	* tests/Hash_Map_Manager_Test.cpp: Changed this example to
+ 	  illustrate ACE_Static_Allocator_Base rather than
+ 	  ACE_Static_Allocator<> since the latter isn't representative of
+ 	  what we'll need to do for TAO.
+
 	* Updated all the Makefile dependencies and also added the
  	  appropriate CVS strings to all Makefiles.
 
@@ -47,6 +34,24 @@ Thu Apr  9 17:31:47 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
  	  Robert J.  Laferriere <laferrie@gsao.med.ge.com> for reporting
  	  this.
 
+Thu Apr 09 18:06:53 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/High_Res_Timer.i (hrtime_to_tv): Cast the parameter for usec
+ 	  to long.  It can be fixed because of Darrell's vigilance.
+
+Thu Apr 09 17:55:21 1998  Steve Huston  <shuston@riverace.com>
+
+	* ace/config-hpux-10.x.h, config-hpux11.h, config-aix-4.2.x.h:
+	  Added ACE_HAS_WILDCARD_BIND.
+
+Thu Apr 09 16:43:26 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/ACE.*: Changed *_version() functions to be non-inlined.
+  	  After this change, inclusion of ace/Version.h can be moved into
+ 	  ACE.cpp.  This change helps as all of ACE doesn't have to be
+ 	  compiled after Version.h changes (Version.h changes every time a
+ 	  new beta is produced).
+
 Thu Apr  9 12:27:23 1998  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
 
 	* tests/Hash_Map_Manager_Test.cpp: POOL_SIZE was simple "const
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index c0daadb1610..fee17b3a20a 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -190,8 +190,8 @@ static const int MAX_HASH = 6;
 // out how to simplify this.
 static const POOL_SIZE = sizeof (HASH_STRING_ENTRY) * STRING_TABLE_SIZE
                          + sizeof (HASH_STRING_ENTRY) * MAX_HASH; 
-
-static ACE_Static_Allocator<POOL_SIZE> allocator;
+static char String_Table_pool[POOL_SIZE];
+static ACE_Static_Allocator_Base allocator (String_Table_pool, POOL_SIZE);
 
 static int
 run_test (void)
diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp
index bc7178619c9..8b946aa0402 100644
--- a/tests/Reactor_Exceptions_Test.cpp
+++ b/tests/Reactor_Exceptions_Test.cpp
@@ -25,9 +25,24 @@
 
 #if defined (ACE_HAS_EXCEPTIONS)
 
+#if defined (ACE_WIN32)
+static void
+raise_exception (void)
+{
+  // Cause a Win32 structured exception.
+  *(char *) 0 = 0;
+}
+#else
 // Just need a simple exception class.
 class Except {};
 
+static void
+raise_exception (void)
+{
+  throw Except ();
+}
+#endif /* ACE_WIN32 */
+
 class Memory_Exception : public ACE_Event_Handler, public ACE_SOCK_Dgram
 {
 public:
@@ -54,22 +69,22 @@ Memory_Exception::handle_input (ACE_HANDLE)
   char buf[BUFSIZ];
   ACE_INET_Addr from_addr;
 
-  ACE_DEBUG ((LM_DEBUG, "Activity occurred on handle %d!\n",
+  ACE_DEBUG ((LM_DEBUG,
+              "Activity occurred on handle %d!\n",
               ACE_SOCK_Dgram::get_handle ()));
 
   ssize_t n = ACE_SOCK_Dgram::recv (buf, sizeof buf, from_addr);
 
   if (n == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "handle_input"));
+    ACE_ERROR ((LM_ERROR,
+                "%p\n",
+                "handle_input"));
   else
-    ACE_DEBUG ((LM_DEBUG, "got buf = %s\n", buf));
+    ACE_DEBUG ((LM_DEBUG,
+                "got buf = %s\n",
+                buf));
 
-#if defined (ACE_WIN32)
-  // Cause a Win32 structured exception.
-  *(char *) 0 = 0;
-#else
-  throw Except ();
-#endif /* ACE_WIN32 */
+  raise_exception ();
   ACE_NOTREACHED (return 0);
 }