ChangeLogTag:Wed Nov 17 07:36:04 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

4 files changed, 13 insertions, 161 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index d6ccb1bd57a..1feae6282ea 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,13 @@
+Wed Nov 17 07:36:04 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* tests: Removed the Cache_Manager_Test.cpp since Cache_Manager.*
+	  is no longer in ACE.  Thanks to Airat A. Sadreev
+ 	  <airat@hq.tatenergo.ru> for reporting this.
+
+	* netsvcs/lib/Client_Logging_Handler.cpp (fini): Added a void *
+	  cast to the arguments to ACE_OS::free().  Thanks to David Levine
+ 	  for reporting this.
+
 Tue Nov 16 07:58:11 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* netsvcs/lib/Client_Logging_Handler.cpp (fini): 
diff --git a/THANKS b/THANKS
index fa933d39f35..bcc4acfe7d4 100644
--- a/THANKS
+++ b/THANKS
@@ -825,6 +825,7 @@ Hani Mawlawi <hmawlawi@wecan.com>
 Benedikt Eric Heinen <beh@icemark.ch>
 Jason Topaz <topaz@panix.com>
 Dmitry Ergy <dergy@websci.ru>
+Airat A. Sadreev <airat@hq.tatenergo.ru> 
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson.  Paul devised the recursive Makefile scheme that
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 7d6515ba9c2..a0b66ead2a4 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -310,8 +310,8 @@ ACE_Client_Logging_Acceptor::fini (void)
   ACE_OS::unlink (this->logger_key_);
 
   // This memory was allocated by <ACE_OS::strdup>.
-  ACE_OS::free (this->logger_key_);
-  ACE_OS::free (this->server_host_);
+  ACE_OS::free ((void *) this->logger_key_);
+  ACE_OS::free ((void *) this->server_host_);
 
   return 0;
 }
diff --git a/tests/Cache_Manager_Test.cpp b/tests/Cache_Manager_Test.cpp
deleted file mode 100644
index a3bbdf12730..00000000000
--- a/tests/Cache_Manager_Test.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Cache_Manager_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the <ACE_Cache_Manager> and illustrates how
-//     to use it to cache objects keyed from strings.
-//
-// = AUTHOR
-//    James Hu
-//
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/ACE.h"
-#include "ace/Synch.h"
-
-#include "ace/Cache_Manager.h"
-
-
-typedef ACE_String_Referenced_Cache_Manager
-        String_Table_Manager;
-
-typedef ACE_Cache_Proxy<const char *, const char, String_Table_Manager>
-        String_Table_Proxy;
-
-static String_Table_Manager *JXH_String_Table_Manager;
-
-static void put1 (void)
-{
-  String_Table_Proxy a((const char *) "hello",
-                       (const char *) "guten Tag", sizeof ( "guten Tag"));
-
-  String_Table_Proxy b((const char *) "good",
-                       (const char *) "gut", sizeof ( "gut"));
-
-  String_Table_Proxy c((const char *) "bad",
-                       (const char *) "schlecht", sizeof ( "schlecht"));
-
-  String_Table_Proxy d((const char *) "ugly",
-                       (const char *) "unsehenlich", sizeof ( "unsehenlich"));
-
-  String_Table_Proxy e((const char *) "bye bye",
-                       (const char *) "tschuess", sizeof ( "tschuess"));
-}
-
-static void put2 (void)
-{
-  String_Table_Proxy a((const char *) "hello",
-                       (const char *) "guten Nacht", sizeof ( "guten Nacht"));
-
-  String_Table_Proxy b((const char *) "good",
-                       (const char *) "vielen glueck", sizeof ( "vielen glueck"));
-
-  String_Table_Proxy c((const char *) "bad",
-                       (const char *) "sehr schlecht", sizeof ( "sehr schlecht"));
-
-  String_Table_Proxy d((const char *) "ugly",
-                       (const char *) "unsehenlicher", sizeof ( "unsehenlicher"));
-
-  String_Table_Proxy e((const char *) "bye bye",
-                       (const char *) "aufwiedersehen", sizeof ( "aufwiedersehen"));
-}
-
-static void get1 (void)
-{
-  {
-    String_Table_Proxy a((const char *) "hello");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "good");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "bad");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "ugly");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "bye bye");
-    cerr << a.data() << endl;
-  }
-}
-
-static void get2 (void)
-{
-  {
-    String_Table_Proxy a((const char *) "bye bye");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "ugly");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "bad");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "good");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "hello");
-    cerr << a.data() << endl;
-  }
-}
-
-int main (void)
-{
-  ACE_START_TEST (ASYS_TEXT ("Cache_Manager_Test"));
-
-  JXH_String_Table_Manager
-  = String_Table_Proxy::Cache_Manager_Singleton::instance ();
-  JXH_String_Table_Manager->open (0, 0, 2, 5, 1, 0, 1, 0);
-
-  put1 ();
-
-  get1 ();
-  get2 ();
-
-  put2 ();
-
-  get1 ();
-  get2 ();
-
-  put1 ();
-
-  get1 ();
-  get2 ();
-
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Cache_Proxy<const char *, const char, String_Table_Manager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Cache_Proxy<const char *, const char, String_Table_Manager>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */