ChangeLogTag:Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com>

90 files changed, 136 insertions, 573 deletions

diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp
index ddce650bdc7..77a041fd58e 100644
--- a/tests/ACE_Init_Test.cpp
+++ b/tests/ACE_Init_Test.cpp
@@ -1,20 +1,18 @@
 // $Id$
+
+// This is a Win32-only test for verifying that the ACE dll
+// initializes itself without having a nonstatic object manager
+// present by way of a console app's main function.  It's a MFC dialog
+// app - it pops up a dialog and spawns a thread - the thread will
+// wait 2 seconds and programatically dismiss the dialog box.  The
+// main thread waits for the other one to exit, and that's the test.
+// If the ACE DLL doesn't initialize correctly, it will go boom!
 //
-// ACE_Init_Test
-//
-// This is a Win32-only test for verifying that the ACE dll initializes itself
-// without having a nonstatic object manager present by way of a console app's
-// main function.  It's a MFC dialog app - it pops up a dialog and spawns a
-// thread - the thread will wait 2 seconds and programatically dismiss the
-// dialog box.  The main thread waits for the other one to exit, and that's
-// the test.  If the ACE DLL doesn't initialize correctly, it will go boom!
-//
-// This test program was initially generated from MSVC AppWizard, then some
-// files were renamed and moved around to fit in with the ACE test directory
-// structure.
+// This test program was initially generated from MSVC AppWizard, then
+// some files were renamed and moved around to fit in with the ACE
+// test directory structure.
 //
 // ACE_Init_Test.cpp : Defines the class behaviors for the application.
-//
 
 #include "ace/Thread_Manager.h"
 #include "ACE_Init_Test_StdAfx.h"
@@ -29,7 +27,6 @@ static char THIS_FILE[] = __FILE__;
 
 static void * wait_and_kill_dialog (void *pBox);
 
-
 /////////////////////////////////////////////////////////////////////////////
 // CACE_Init_TestApp
 
diff --git a/tests/ARGV_Test.cpp b/tests/ARGV_Test.cpp
index a40186f8dd2..c0f77b9968a 100644
--- a/tests/ARGV_Test.cpp
+++ b/tests/ARGV_Test.cpp
@@ -19,12 +19,8 @@
 
 ACE_RCSID(tests, ARGV_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-int main(int, char *argv[])
+int 
+main (int, char *argv[])
 {
   ACE_START_TEST (ASYS_TEXT ("ARGV_Test"));
 
diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp
index 5b839234953..e29a6ce61b9 100644
--- a/tests/Aio_Platform_Test.cpp
+++ b/tests/Aio_Platform_Test.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 // ============================================================================
 //
 // = FILENAME
@@ -12,8 +13,8 @@
 //     features further.
 //
 // = AUTHOR
-//    Programming for the Real World. Bill O. GallMeister.
-//    Modified by Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//    Programming for the Real World. Bill O. GallMeister.  Modified
+//    by Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
 // =====================================================================
 
@@ -22,11 +23,6 @@
 
 ACE_RCSID(tests, Aio_Platform_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (_POSIX_ASYNCHRONOUS_IO)
 static int do_sysconf (void)
 {
diff --git a/tests/Atomic_Op_Test.cpp b/tests/Atomic_Op_Test.cpp
index 847841d2941..cedbd26de63 100644
--- a/tests/Atomic_Op_Test.cpp
+++ b/tests/Atomic_Op_Test.cpp
@@ -15,7 +15,7 @@
 //      these operations.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -24,11 +24,6 @@
 
 ACE_RCSID(tests, Atomic_Op_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 int
diff --git a/tests/Auto_IncDec_Test.cpp b/tests/Auto_IncDec_Test.cpp
index 68497c4e1bd..255b3d5f1f2 100644
--- a/tests/Auto_IncDec_Test.cpp
+++ b/tests/Auto_IncDec_Test.cpp
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Auto_IncDec_Test, "Auto_IncDec_Test.cpp, by Edan Ayal")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Default number of threads.
diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp
index d18250d1948..a29a6b7ef21 100644
--- a/tests/Barrier_Test.cpp
+++ b/tests/Barrier_Test.cpp
@@ -13,7 +13,7 @@
 //     mechanisms work.
 //
 // = AUTHOR
-//    Prashant Jain and Doug Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Barrier_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 struct Tester_Args
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 437c9df0bbc..f4be82c3a0a 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -12,7 +12,7 @@
 //    Checks the #defines in ace/Basic_Types.h, and a few other basics.
 //
 // = AUTHOR
-//    David L. Levine
+//    David L. Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -37,12 +37,6 @@
 
 ACE_RCSID(tests, Basic_Types_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-
 typedef void* (*a_function_pointer) (void*);
 
 static
diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp
index 786025f88a2..7540988d69b 100644
--- a/tests/Buffer_Stream_Test.cpp
+++ b/tests/Buffer_Stream_Test.cpp
@@ -17,7 +17,7 @@
 //     components reduces the reliance on global variables.
 //
 // = AUTHOR
-//    Prashant Jain and Doug Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -29,11 +29,6 @@
 
 ACE_RCSID(tests, Buffer_Stream_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream;
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index deea7e6870f..9a254cefc4e 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -15,6 +15,7 @@
 // = AUTHORS
 //    Giga Giguashvili <gregoryg@ParadigmGeo.com> and
 //    Douglas C. Schmidt <schmidt@cs.wustl.edu>
+//
 // ============================================================================
 
 #include "ace/CDR_Stream.h"
@@ -25,11 +26,6 @@
 
 ACE_RCSID(tests, CDR_File_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 class CDR_Test
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index 400b0ad6802..d2624bd307a 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, CDR_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static int n = 4096;
 static int nloops = 100;
 
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
index 0da3c4fc53a..24fb6bcf298 100644
--- a/tests/Cache_Map_Manager_Test.cpp
+++ b/tests/Cache_Map_Manager_Test.cpp
@@ -35,11 +35,6 @@
 #include "ace/Get_Opt.h"
 #include "Cache_Map_Manager_Test.h"     // Hash_Key class defined in here
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 typedef size_t KEY;
 typedef size_t VALUE;
 typedef int ATTR;
diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
index 87e84f8ffaa..7683f3d53bb 100644
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ b/tests/Cached_Accept_Conn_Test.cpp
@@ -46,20 +46,14 @@
 
 ACE_RCSID(tests, Cached_Accept_Conn_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3
 // happy, it was necessary to have the definitions of the methods of
 // the Accept_Strategy before the instantiations.
-//
 
-// HPUX doesnt accept these declaration after their usage.
+// HPUX doesn't accept these declaration after their usage.
 
 // For some strange reason this must *not* be static since otherwise
-// certain versions of SunC++ will not link properly. 
+// certain versions of SunC++ will not link properly.
 int connection_accepted = 0;
 
 // For some strange reason this must *not* be static since otherwise
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index b23f98386c4..c1ccafa58f3 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -300,11 +300,6 @@ template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
 
 #endif /* CACHED_CONNECT_TEST */
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static int debug = 0;
 
 Svc_Handler::Svc_Handler (ACE_Thread_Manager *t)
diff --git a/tests/Capabilities_Test.cpp b/tests/Capabilities_Test.cpp
index 6ea3f0fe04b..984f1c7be48 100644
--- a/tests/Capabilities_Test.cpp
+++ b/tests/Capabilities_Test.cpp
@@ -22,11 +22,6 @@
 
 ACE_RCSID(tests, Capabilities_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static const char config[] = "Capabilities_Test.cfg";
 
 static int
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp
index d30b7cd3d12..3d25d4fd6d8 100644
--- a/tests/Collection_Test.cpp
+++ b/tests/Collection_Test.cpp
@@ -13,7 +13,7 @@
 //     iterators.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -21,11 +21,6 @@
 
 ACE_RCSID(tests, Collection_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #include "ace/Containers.h"
 
 typedef int DATA;
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 378306a3ca1..dfc6a05f473 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -198,11 +198,6 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Default number of clients/servers.
 #if defined (ACE_HAS_PHARLAP)
 // PharLap is, by default, resource contrained. Test for something that works
diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index 4efe745132f..defcdd203f7 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -29,12 +29,6 @@ ACE_RCSID(tests, DLL_Test, "$Id$")
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Considering UNIX OS to be default. On Win32 platforms, the symbols
 // are got form the .exe as one cant have .exe and .dll for the same
 // .cpp. Also, on Win32 platforms one cant use the .obj to obtain
@@ -48,24 +42,26 @@ USELIB("..\ace\aced.lib");
 #  define OBJ_PREFIX "./" ACE_DLL_PREFIX
 #endif /*ACE_WIN32*/
 
-
 char const *
-cdecl_decoration(char const * func_name)
+cdecl_decoration (char const *func_name)
 {
-#if defined(__BORLANDC__)
+#if defined (__BORLANDC__)
   static char decorated_func_name[10*1024];
-  ACE_OS::sprintf(decorated_func_name, "_%s", func_name);
+  ACE_OS::sprintf (decorated_func_name,
+                   "_%s",
+                   func_name);
   return decorated_func_name;
 #else
   return func_name;
-#endif
+#endif /* __BORLANDC__ */
 }
 
 // This function returns the Hello object pointer.
 
 extern "C" ACE_Svc_Export Hello *get_hello (void);
 
-Hello *get_hello (void)
+Hello *
+get_hello (void)
 {
   Hello *hello = 0;
 
@@ -100,11 +96,12 @@ main (int argc, ASYS_TCHAR *argv[])
 		       dll.error ()),
                       -1);
 
-  // Just becos the ANSI C++ spec says you can no longer cast a void* to a
-  // function pointer. Doesnt allow:TC f = (TC) dll.symbol ("get_hello");
-  void * foo;
+  // Just because the ANSI C++ spec says you can no longer cast a
+  // void* to a function pointer. Doesn't allow:
+  // TC f = (TC) dll.symbol ("get_hello");
+  void *foo;
 
-  char const *cdecl_str = cdecl_decoration("get_hello");
+  char const *cdecl_str = cdecl_decoration ("get_hello");
   foo = dll.symbol (cdecl_str);
 
   // Cast the void* to long first.
@@ -131,7 +128,6 @@ main (int argc, ASYS_TCHAR *argv[])
   return 0;
 }
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class auto_ptr <Hello>;
 template class ACE_Auto_Basic_Ptr <Hello>;
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index 0df99359267..fd9e6e9c9fb 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -12,7 +12,7 @@
 //      This test illustrates the use of <ACE_DLList>.
 //
 // = AUTHOR
-//    James Hu and Douglas C. Schmidt
+//    James Hu <jxh@cs.wustl.edu> and Douglas C. Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -37,11 +37,6 @@ template class ACE_Static_Allocator<8192>;
 #pragma instantiate ACE_Static_Allocator<8192>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static ACE_Static_Allocator<8192> alloc;
 
 static ACE_STRING string_table[] =
diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp
index 900f2b39dba..d1b46b7ef87 100644
--- a/tests/Dynamic_Priority_Test.cpp
+++ b/tests/Dynamic_Priority_Test.cpp
@@ -54,12 +54,6 @@
 
 ACE_RCSID(tests, Dynamic_Priority_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-
 enum Test_Type {BEST, WORST, RANDOM};
 
 class ArgStruct
diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp
index 76742d3f8b6..071c06c6843 100644
--- a/tests/Enum_Interfaces_Test.cpp
+++ b/tests/Enum_Interfaces_Test.cpp
@@ -33,11 +33,6 @@
 
 ACE_RCSID(tests, Enum_Interfaces_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 int
 main (int, ASYS_TCHAR *[])
 {
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index 084102236dd..da467ad1ba8 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -21,11 +21,6 @@
 
 ACE_RCSID(tests, Env_Value_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #define TEST_THIS(type, varname, defval, expval) \
 do { \
   ACE_Env_Value<type> val (varname, (defval)); \
diff --git a/tests/FlReactor_Test.cpp b/tests/FlReactor_Test.cpp
index 0c20c5a81b9..b7afb411cb8 100644
--- a/tests/FlReactor_Test.cpp
+++ b/tests/FlReactor_Test.cpp
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, FlReactor_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_HAS_FL)
 
 int main (int, char*[])
diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp
index 2c9ba7ca212..179e6febfa6 100644
--- a/tests/Future_Set_Test.cpp
+++ b/tests/Future_Set_Test.cpp
@@ -16,8 +16,9 @@
 //    are prime.
 //
 // = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu>, and Per Andersson <pera@ipso.se>
+//    Andres Kruse <Andres.Kruse@cern.ch>,
+//    Douglas C. Schmidt <schmidt@cs.wustl.edu>,
+//    and Per Andersson <pera@ipso.se>
 //
 // ============================================================================
 
@@ -34,11 +35,6 @@
 
 ACE_RCSID(tests, Future_Set_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-  USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT;
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 73502edff87..2c02aa1c8a2 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -16,8 +16,9 @@
 //    are prime.
 //
 // = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu>, and Per Andersson <pera@ipso.se>
+//    Andres Kruse <Andres.Kruse@cern.ch>,
+//    Douglas C. Schmidt <schmidt@cs.wustl.edu>,
+//    and Per Andersson <pera@ipso.se>
 //
 // ============================================================================
 
@@ -33,11 +34,6 @@
 
 ACE_RCSID(tests, Future_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT;
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index 151e7083d82..8964aed6d94 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Handle_Set_Test, "Handle_Set_Test.cpp,v 4.34 1999/09/19 15:53:54 schmidt Exp")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static void
 test_duplicates (size_t count)
 {
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp
index 83bc58b2da5..75f044d0d34 100644
--- a/tests/Hash_Map_Bucket_Iterator_Test.cpp
+++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp
@@ -12,7 +12,7 @@
 //     This is a simple test of the <Hash_Map_Bucket_Iterator>.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -24,13 +24,6 @@
 
 ACE_RCSID(tests, Hash_Map_Bucket_Iterator_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-////////////////////////////////////////////////////////////////////////////////
-
 static ACE_UINT32 iterations = ACE_MAX_ITERATIONS * 10;
 static ACE_UINT32 table_size = ACE_MAX_ITERATIONS;
 
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index f766a4baeca..32150c2735c 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -57,12 +57,6 @@ template class ACE_Static_Allocator<STRING_TABLE_SIZE>;
 
 static ACE_Static_Allocator<STRING_TABLE_SIZE> alloc;
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-
 typedef ACE_Hash_Map_Manager_Ex<LPCTSTR,
                                 LPCTSTR,
                                 ACE_Hash<LPCTSTR>,
diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp
index b20f86304d4..1dd6f9bd555 100644
--- a/tests/High_Res_Timer_Test.cpp
+++ b/tests/High_Res_Timer_Test.cpp
@@ -1,5 +1,5 @@
 // $Id$
-//
+
 // ============================================================================
 //
 // = LIBRARY
@@ -12,7 +12,7 @@
 //    Simple test of ACE_High_Res_Timer.
 //
 // = AUTHOR
-//    David L. Levine
+//    David L. Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -24,11 +24,6 @@
 
 ACE_RCSID(tests, High_Res_Timer_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static
 u_int
 check (const u_int interval, const u_int measured)
@@ -41,17 +36,15 @@ check (const u_int interval, const u_int measured)
   const u_int percentage_difference = difference * 100 / interval;
 
   if (percentage_difference < threshold)
-    {
-      return 0;
-    }
+    return 0;
   else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("The measured time of %u differs from ")
-                  ASYS_TEXT ("the interval of %u by %u percent.\n"),
-                  measured, interval, percentage_difference));
-      return 1;
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ASYS_TEXT ("The measured time of %u differs from ")
+                       ASYS_TEXT ("the interval of %u by %u percent.\n"),
+                       measured,
+                       interval,
+                       percentage_difference),
+                      1);
 }
 
 static
@@ -78,8 +71,9 @@ main (int argc, ASYS_TCHAR *argv[])
 {
   ACE_START_TEST (ASYS_TEXT ("High_Res_Timer_Test"));
 
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("The ACE_High_Res_Timer scale factor is %u ")
-                        ASYS_TEXT ("1/microsecond\n"),
+  ACE_DEBUG ((LM_DEBUG,
+              ASYS_TEXT ("The ACE_High_Res_Timer scale factor is %u ")
+              ASYS_TEXT ("1/microsecond\n"),
               ACE_High_Res_Timer::global_scale_factor ()));
 
   u_int errors = 0;
@@ -105,7 +99,8 @@ main (int argc, ASYS_TCHAR *argv[])
         {
           const ACE_Time_Value interval (0, intervals[i]);
           const ACE_Time_Value measured = time_interval (interval);
-          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("interval: %u usec, measured: %u usec%s\n"),
+          ACE_DEBUG ((LM_DEBUG,
+                      ASYS_TEXT ("interval: %u usec, measured: %u usec%s\n"),
                       interval.sec () * 1000000 + interval.usec (),
                       measured.sec () * 1000000 + measured.usec (),
                       intervals[i] <= TIMER_RESOLUTION  ?
diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp
index b7867aa97dc..c2e33e47972 100644
--- a/tests/IOStream_Test.cpp
+++ b/tests/IOStream_Test.cpp
@@ -26,11 +26,6 @@
 
 ACE_RCSID (tests, IOStream_Test, "$Id$")
 
-#if defined (__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB ("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 
 typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream;
diff --git a/tests/Lazy_Map_Manager_Test.cpp b/tests/Lazy_Map_Manager_Test.cpp
index e22a168fb7e..0ce276c47c4 100644
--- a/tests/Lazy_Map_Manager_Test.cpp
+++ b/tests/Lazy_Map_Manager_Test.cpp
@@ -15,6 +15,7 @@
 //
 // = AUTHOR
 //    Irfan Pyarali <irfan@cs.wustl.edu>,
+//
 // ============================================================================
 
 #include "test_config.h"
@@ -25,11 +26,6 @@
 
 ACE_RCSID(tests, Map_Manager_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Simple map manager.
 typedef ACE_Map_Manager<int, int, ACE_Null_Mutex> MAP;
 
diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp
index 51a3efa172a..82cae74bda8 100644
--- a/tests/Log_Msg_Test.cpp
+++ b/tests/Log_Msg_Test.cpp
@@ -27,11 +27,6 @@
 
 ACE_RCSID(tests, Log_Msg_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static void
 cleanup (void)
 {
diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp
index 523459ec6fd..62c9743cfa2 100644
--- a/tests/MM_Shared_Memory_Test.cpp
+++ b/tests/MM_Shared_Memory_Test.cpp
@@ -28,11 +28,6 @@
 
 ACE_RCSID(tests, MM_Shared_Memory_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 const int SHMSZ = 27;
 static TCHAR shm_key[] = ACE_TEMP_FILE_NAME ACE_TEXT ("XXXXXX");
 
diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp
index 42a6d2a4902..98dcbbd6c94 100644
--- a/tests/MT_Reactor_Timer_Test.cpp
+++ b/tests/MT_Reactor_Timer_Test.cpp
@@ -24,11 +24,6 @@
 
 ACE_RCSID(tests, MT_Reactor_Timer_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // This test exercises the setting and cancelling of timers from a
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp
index d348bdfa15e..a6dbb1bd34e 100644
--- a/tests/MT_SOCK_Test.cpp
+++ b/tests/MT_SOCK_Test.cpp
@@ -33,11 +33,6 @@
 
 ACE_RCSID(tests, MT_SOCK_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static void *
 client (void *arg)
 {
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp
index f9dc93142c6..e2f51c51547 100644
--- a/tests/Malloc_Test.cpp
+++ b/tests/Malloc_Test.cpp
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, SV_Shared_Memory_Test, "Malloc_Test.cpp,v 4.22 1999/12/13 22:24:42 nanbor Exp")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (__Lynx__) && (!defined (ACE_LACKS_FORK) || defined (ACE_WIN32))
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 859184a5022..c4814771c55 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -17,6 +17,7 @@
 //    Irfan Pyarali <irfan@cs.wustl.edu>,
 //    Douglas C. Schmidt <schmidt@cs.wustl.edu>, and
 //    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+// 
 // ============================================================================
 
 #include "test_config.h"
@@ -31,11 +32,6 @@
 
 ACE_RCSID(tests, Map_Manager_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 typedef ACE_Null_Mutex MUTEX;
 typedef ACE_UINT32 TYPE;
 typedef ACE_Active_Map_Manager_Key
diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp
index 4dd11067862..ac8c5115bab 100644
--- a/tests/Map_Test.cpp
+++ b/tests/Map_Test.cpp
@@ -13,7 +13,7 @@
 //     use the forward and reverse iterators.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -25,13 +25,6 @@
 
 ACE_RCSID(tests, Map_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-////////////////////////////////////////////////////////////////////////////////
-
 // Value type.
 typedef size_t VALUE;
 
diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp
index bfb390d3120..9ec2d2993d4 100644
--- a/tests/Mem_Map_Test.cpp
+++ b/tests/Mem_Map_Test.cpp
@@ -15,7 +15,7 @@
 //      original file.
 //
 // = AUTHOR
-//    Prashant Jain
+//    Prashant Jain <pjain@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -24,11 +24,6 @@
 
 ACE_RCSID(tests, Mem_Map_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static const int LINE_LENGTH = 10;
 static const int NUM_LINES = 15;
 
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 968e82e3a1e..4092df0c4cb 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -10,11 +10,11 @@
 //
 // = DESCRIPTION
 //      This test program is a torture test that illustrates how
-//      ACE_Message_Block reference counting works in multi-threaded
+//      <ACE_Message_Block> reference counting works in multi-threaded
 //      code.
 //
 // = AUTHOR
-//    Doug Schmidt and Nanbor Wang
+//    Doug Schmidt <schmidt@cs.wustl.edu> and Nanbor Wang <nanbor@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -26,11 +26,6 @@
 
 ACE_RCSID(tests, Message_Block_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Number of memory allocation strategies used in this test.
 static const int ACE_ALLOC_STRATEGY_NO = 2;
 
diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp
index 97aea00ad64..ac28b577e04 100644
--- a/tests/Message_Queue_Notifications_Test.cpp
+++ b/tests/Message_Queue_Notifications_Test.cpp
@@ -30,7 +30,7 @@
 //      signaling mechanism works flawlessly.
 //
 // = AUTHOR
-//    Irfan Pyarali and Nanbor Wang.
+//    Irfan Pyarali <irfan@cs.wustl.edu> and Nanbor Wang <nanbor@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -41,11 +41,6 @@
 
 ACE_RCSID(tests, Message_Queue_Notifications_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static int iterations = 10;
 
 static const size_t worker_threads = 2;
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index aca3eba6aa9..ec93d1e38d1 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -18,7 +18,7 @@
 //      3) a test/usage example of ACE_Message_Queue_Vx.
 //
 // = AUTHORS
-//    Irfan Pyarali and David L. Levine
+//    Irfan Pyarali <irfan@cs.wustl.edu> and David L. Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -30,11 +30,6 @@
 
 ACE_RCSID(tests, Message_Queue_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 const ASYS_TCHAR usage[] = ASYS_TEXT ("usage: Message_Queue_Test <number of messages>\n");
 
 typedef ACE_Message_Queue<ACE_NULL_SYNCH> QUEUE;
diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp
index 937a5411cf8..60be9098721 100644
--- a/tests/Naming_Test.cpp
+++ b/tests/Naming_Test.cpp
@@ -14,7 +14,7 @@
 //      the local naming context.
 //
 // = AUTHOR
-//    Prashant Jain and Irfan Pyarali
+//    Prashant Jain <pjain@cs.wustl.edu> and Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Naming_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static char name[BUFSIZ];
 static char value[BUFSIZ];
 static char type[BUFSIZ];
diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp
index 7fe49e79948..8138b0bac13 100644
--- a/tests/New_Fail_Test.cpp
+++ b/tests/New_Fail_Test.cpp
@@ -30,11 +30,6 @@
 
 ACE_RCSID(tests, New_Fail_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // 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
diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp
index 1f752964c49..cb5462e8638 100644
--- a/tests/Notify_Performance_Test.cpp
+++ b/tests/Notify_Performance_Test.cpp
@@ -31,11 +31,6 @@
 
 ACE_RCSID(tests, Notify_Performance_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Number of client (user) threads
diff --git a/tests/Object_Manager_Test.cpp b/tests/Object_Manager_Test.cpp
index dc8e543eab4..c10f556ee3d 100644
--- a/tests/Object_Manager_Test.cpp
+++ b/tests/Object_Manager_Test.cpp
@@ -1,5 +1,5 @@
 // $Id$
-//
+
 // ============================================================================
 //
 // = LIBRARY
@@ -12,13 +12,15 @@
 //    Tests the basic functions of the ACE_Object_Manager.
 //
 // = AUTHOR
-//    David L. Levine
+//    David L. Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
 #include "test_config.h"
 #include "ace/Object_Manager.h"
 
+ACE_RCSID(tests, Object_Manager_Test, "$Id$")
+
 static u_int *ip;
 
 extern "C"
diff --git a/tests/OrdMultiSet_Test.cpp b/tests/OrdMultiSet_Test.cpp
index 1b375be84b7..804af5ab9a5 100644
--- a/tests/OrdMultiSet_Test.cpp
+++ b/tests/OrdMultiSet_Test.cpp
@@ -9,12 +9,13 @@
 //    OrdMultiSet_Test.cpp
 //
 // = DESCRIPTION
-//    This is a simple test of the ACE_Ordered_MultiSet and
-//    ACE_Ordered_MultiSet_Iterator class templates, instantiating them with
-//    type int.  No command line arguments are needed to run the test.
+//    This is a simple test of the <ACE_Ordered_MultiSet> and
+//    <ACE_Ordered_MultiSet_Iterator> class templates, instantiating
+//    them with type int.  No command line arguments are needed to run
+//    the test.
 //
 // = AUTHOR
-//    Chris Gill
+//    Chris Gill <cdgill@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -26,11 +27,6 @@
 
 ACE_RCSID(tests, OrdMultiSet_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 int
 main (int, ASYS_TCHAR *[])
 {
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index 10885967b3a..f99c547bc93 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -12,7 +12,7 @@
 //    Tests the construction of multiple pipes in a process.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Pipe_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_LACKS_FORK)
 static int close_pipe = 1;
 static int child_process = 0;
diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp
index 9617e25ae42..14ef4dee0ac 100644
--- a/tests/Priority_Buffer_Test.cpp
+++ b/tests/Priority_Buffer_Test.cpp
@@ -26,11 +26,6 @@
 
 ACE_RCSID(tests, Priority_Buffer_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Global message count.
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 08a91bb1f65..5ad543dcebc 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -20,7 +20,7 @@
 //     simple <ACE_Svc_Handler>, <ACE_Connectors> and <ACE_Acceptors>.
 //
 // = AUTHOR
-//    Carlos O'Ryan
+//    Carlos O'Ryan <coryan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -38,11 +38,6 @@
 
 ACE_RCSID(tests, Priority_Reactor_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // The number of children to run, it can be changed using the -c
 // option.
 static int opt_nchildren =
diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp
index cebda8e419c..e74dbb85a81 100644
--- a/tests/Priority_Task_Test.cpp
+++ b/tests/Priority_Task_Test.cpp
@@ -24,11 +24,6 @@
 
 ACE_RCSID(tests, Priority_Task_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static const ASYS_TCHAR *usage = ASYS_TEXT ("usage: %s [-d]\n");
 
 #if defined (ACE_HAS_THREADS)
diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp
index 0429ca4f3e1..259ab0f9d0d 100644
--- a/tests/Process_Manager_Test.cpp
+++ b/tests/Process_Manager_Test.cpp
@@ -31,11 +31,6 @@
 
 ACE_RCSID(tests, Process_Manager_Test, "Process_Manager_Test.cpp,v 4.11 1999/09/02 04:36:30 schmidt Exp")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS)
 
 static u_int debug_test = 0;
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index fa60952deb9..b0f4f861f5a 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Process_Mutex_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_LACKS_FORK)
 static int release_mutex = 1;
 static int child_process = 0;
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 1bcc5fd9397..17b9a655fc1 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -83,11 +83,6 @@ template class ACE_Write_Guard<ACE_File_Lock>;
 #pragma instantiate ACE_Write_Guard<ACE_File_Lock>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Define a <Strategy_Acceptor> that's parameterized by the
 // <Counting_Service>.
 
diff --git a/tests/Purgable_Map_Manager_Test.cpp b/tests/Purgable_Map_Manager_Test.cpp
index 6e3a1e1d609..ae59a991e1b 100644
--- a/tests/Purgable_Map_Manager_Test.cpp
+++ b/tests/Purgable_Map_Manager_Test.cpp
@@ -27,11 +27,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 ACE_RCSID(tests, Purgable_Map_Manager_Test, "$Id$")
 
 class Entry_ID 
@@ -41,33 +36,32 @@ class Entry_ID
   //
   //= DESCRIPTION
   //   This class is used as an KEY and VALUE of the map entry.
-  
 public:
   Entry_ID (int val = 0)
     : val_ (val)
-    {
-    }
+  {
+  }
   
   ~Entry_ID (void)
-    {
-    }
+  {
+  }
 
   // Obtain the value stored.
   int get_val (void)
-    {
-      return this->val_;
-    }
+  {
+    return this->val_;
+  }
 
   // Hashing needed to access an entry in the map.
   u_long hash (void) const
-    {
-      return this->val_;
-    } 
+  {
+    return this->val_;
+  } 
   // Needed since every entry KEY has to be checked on a lookup.
-   friend int operator== (const Entry_ID &lhs, const Entry_ID &rhs) 
-    {
-      return (&lhs == &rhs) ? 0 : 1;
-    }
+  friend int operator== (const Entry_ID &lhs, const Entry_ID &rhs) 
+  {
+    return (&lhs == &rhs) ? 0 : 1;
+  }
   
 private:   
   int val_;
@@ -83,7 +77,8 @@ void display_map (PURGE_MAP &map)
   // The Hash_Map entry without the purgable feature.
   typedef ACE_Hash_Map_Entry<Entry_ID, Entry_ID> *ENTRY;
 
-  // The derived class from Hash_Map_Entry which facilitates purging thru its purge_tag member.
+  // The derived class from Hash_Map_Entry which facilitates purging
+  // thru its purge_tag member.
   typedef ACE_Hash_Purgable_Map_Entry<Entry_ID, Entry_ID> *PURGABLE_ENTRY;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -99,16 +94,17 @@ void display_map (PURGE_MAP &map)
     {      
       purgable_entry = (PURGABLE_ENTRY) entry;
 
-     ACE_DEBUG ((LM_DEBUG,
-                 "%d:%d purge_tag:%d\n",
-                 (purgable_entry->ext_id_).get_val (),
-                 (purgable_entry->int_id_).get_val (),
-                 purgable_entry->get_purge_tag ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  "%d:%d purge_tag:%d\n",
+                  (purgable_entry->ext_id_).get_val (),
+                  (purgable_entry->int_id_).get_val (),
+                  purgable_entry->get_purge_tag ()));
       
     }
 }
 
-int main (int argc, char *argv[])
+int 
+main (int argc, char *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/tests/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp
index 0ee92282087..c8158eaf9d0 100644
--- a/tests/RB_Tree_Test.cpp
+++ b/tests/RB_Tree_Test.cpp
@@ -10,12 +10,12 @@
 //
 // = DESCRIPTION
 //    This is a test to verify and illustrate the use of the
-//    ACE_RB_Tree ACE_RB_Tree_Iterator, and
-//    ACE_RB_Tree_Reverse_Iterator classes.  Two different key and
+//    <ACE_RB_Tree ACE_RB_Tree_Iterator> and
+//    <ACE_RB_Tree_Reverse_Iterator> classes.  Two different key and
 //    item types are used in order to demonstrate specialization of
-//    the ACE_Less_Than comparison function object template: int (for
-//    which the native < operator is sufficient), and const char *
-//    (for which < operator semantics must be replaced by strcmp
+//    the <ACE_Less_Than> comparison function object template: int
+//    (for which the native < operator is sufficient), and const char
+//    * (for which < operator semantics must be replaced by strcmp
 //    semantics).  An RB tree for each of the four possible type
 //    parameter permutations over int and const char * is constructed
 //    and filled in, and the resulting order is checked via an
@@ -32,11 +32,6 @@
 
 ACE_RCSID(tests, RB_Tree_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Type definitions for the four distinct parameterizations of the
 // test.
 
diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp
index fa7f3797c4e..0fe412cf772 100644
--- a/tests/Reactor_Exceptions_Test.cpp
+++ b/tests/Reactor_Exceptions_Test.cpp
@@ -13,7 +13,7 @@
 //      correctly in the face of C++ exceptions and threads.
 //
 // = AUTHOR
-//    Luca Priorelli <lucapri@mbox.vol.it> and Douglas C. Schmidt
+//    Luca Priorelli <lucapri@mbox.vol.it> and Douglas C. Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Reactor_Exceptions_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_EXCEPTIONS)
 
 #if defined (ACE_WIN32)
diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp
index 1db35ba60bb..29d08bbb5ce 100644
--- a/tests/Reactor_Notify_Test.cpp
+++ b/tests/Reactor_Notify_Test.cpp
@@ -30,11 +30,6 @@
 
 ACE_RCSID(tests, Reactor_Notify_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 static const int LONG_TIMEOUT = 10;
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index 20db2146afc..54d8b68da78 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -9,13 +9,12 @@
 //    Reactor_Performance_Test.cpp
 //
 // = DESCRIPTION
-//
 //    This test is used to time the dispatching mechanisms of the
-//    ACE_Reactors. Both the WFMO_Reactor and Select_Reactor can be
-//    tested.
+//    <ACE_Reactor>s. Both the <ACE_WFMO_Reactor> and
+//    <ACE_Select_Reactor> can be tested.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -34,11 +33,6 @@
 
 ACE_RCSID(tests, Reactor_Performance_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Number of client (user) threads
diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp
index 3ddfa466a97..d1fe88674f5 100644
--- a/tests/Reactor_Timer_Test.cpp
+++ b/tests/Reactor_Timer_Test.cpp
@@ -26,11 +26,6 @@
 
 ACE_RCSID(tests, Reactor_Timer_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static int done = 0;
 static int count = 0;
 static int odd = 0;
diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp
index 457ab3ae234..4c3ea3a6e1e 100644
--- a/tests/Reactors_Test.cpp
+++ b/tests/Reactors_Test.cpp
@@ -13,7 +13,9 @@
 //      <ACE_Reactors> and <ACE_Tasks> in the same process.
 //
 // = AUTHOR
-//    Prashant Jain, Detlef Becker, and Douglas C. Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu>, 
+//    Detlef Becker <Detlef.Becker@med.siemens.de>, and 
+//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +25,6 @@
 
 ACE_RCSID(tests, Reactors_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 ACE_Thread_Manager *thr_mgr;
diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp
index 65534952a19..018b1eddd13 100644
--- a/tests/Reader_Writer_Test.cpp
+++ b/tests/Reader_Writer_Test.cpp
@@ -14,7 +14,7 @@
 //      pthreads.
 //
 // = AUTHOR
-//    Prashant Jain and Doug C. Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug C. Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -26,11 +26,6 @@
 
 ACE_RCSID(tests, Reader_Writer_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Default number of iterations.
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index 5897f3a5d65..8bfc818a0e6 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -14,7 +14,7 @@
 //      pthreads.
 //
 // = AUTHOR
-//    Prashant Jain and Doug C. Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug C. Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Recursive_Mutex_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Total number of iterations.
diff --git a/tests/Reverse_Lock_Test.cpp b/tests/Reverse_Lock_Test.cpp
index 2577447a73a..6fba4738452 100644
--- a/tests/Reverse_Lock_Test.cpp
+++ b/tests/Reverse_Lock_Test.cpp
@@ -14,7 +14,7 @@
 //    command line arguments are needed to run the test.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -22,11 +22,6 @@
 
 ACE_RCSID(tests, Reverse_Lock_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 typedef ACE_Reverse_Lock<ACE_SYNCH_MUTEX> REVERSE_MUTEX;
 
 int
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index 51672529e9a..0b891511990 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -13,7 +13,7 @@
 //     than on success cases.
 //
 // = AUTHOR
-//    Steve Huston
+//    Steve Huston <shuston@riverace.com>
 //
 // ============================================================================
 
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, SOCK_Connector_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_LACKS_GETHOSTENT)
 // Determine if a host exists, is reachable, and is up.
 // Attempt a blocking connection to it; if it succeeds,
diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp
index 5c8a1fcfd03..1d289038f19 100644
--- a/tests/SOCK_Send_Recv_Test.cpp
+++ b/tests/SOCK_Send_Recv_Test.cpp
@@ -34,11 +34,6 @@
 
 ACE_RCSID(tests, SOCK_Send_Recv_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // Change to non-zero if test fails
 static int Test_Result = 0;
 
diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp
index 1b7756dfb38..61629d61a34 100644
--- a/tests/SOCK_Test.cpp
+++ b/tests/SOCK_Test.cpp
@@ -16,7 +16,7 @@
 //     exchange data.
 //
 // = AUTHOR
-//    Prashant Jain and Doug Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -30,11 +30,6 @@
 
 ACE_RCSID(tests, SOCK_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static void *
 client (void *arg)
 {
diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp
index ca977366c58..9e0f08f67cc 100644
--- a/tests/SPIPE_Test.cpp
+++ b/tests/SPIPE_Test.cpp
@@ -17,7 +17,7 @@
 //      required as far as command line arguments are concerned.
 //
 // = AUTHOR
-//    Prashant Jain
+//    Prashant Jain <pjain@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -31,11 +31,6 @@
 
 ACE_RCSID(tests, SPIPE_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)
 // pipe name to use
 static const char *PIPE_NAME = "ace_pipe_name";
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index 31051af0b75..ff406b7b3e4 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -1,6 +1,6 @@
-// ============================================================================
 // $Id$
 
+// ============================================================================
 //
 // = LIBRARY
 //    tests
@@ -14,7 +14,7 @@
 //      the test.
 //
 // = AUTHOR
-//    Prashant Jain
+//    Prashant Jain <pjain@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, SString_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 int
 main (int, ASYS_TCHAR *[])
 {
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index afb65852a13..91f6d41eab0 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -27,11 +27,6 @@
 
 ACE_RCSID(tests, SV_Shared_Memory_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
 
 // The shared memory allocator, which uses up the ACE_DEFAULT_SEM_KEY.
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index ed8e19d9a56..5fcc651ece8 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Semaphore_Test, "$Id$")
 
-#if defined (__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB ("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // msec that times are allowed to differ before test fails.
 #define ACE_ALLOWED_SLACK  100
 
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index 969df5f69c0..80f86622ead 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -13,7 +13,7 @@
 //      working correctly.
 //
 // = AUTHOR
-//    David Levine
+//    David Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Service_Config_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static const u_int VARIETIES = 3;
 
 static u_int error = 0;
diff --git a/tests/Sigset_Ops_Test.cpp b/tests/Sigset_Ops_Test.cpp
index 62cad35df60..884e3486e44 100644
--- a/tests/Sigset_Ops_Test.cpp
+++ b/tests/Sigset_Ops_Test.cpp
@@ -14,7 +14,7 @@
 //     sigismember().
 //
 // = AUTHOR
-//    Nanbor Wang
+//    Nanbor Wang <nanbor@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Sigset_Ops_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 void
 siglistset(sigset_t x, int *sigset)
 {
diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp
index 2b35bf12e89..0a02186862e 100644
--- a/tests/Simple_Message_Block_Test.cpp
+++ b/tests/Simple_Message_Block_Test.cpp
@@ -9,14 +9,13 @@
 //    Simple_Message_Block_Test.cpp
 //
 // = DESCRIPTION
-//
 //      This test program is a torture test that illustrates how
 //      ACE_Message_Block reference counting works, how and when locks
 //      are used, how memory is managed, and how continuation chains
 //      of message blocks are made. Ideally used with purify :-)
 //
 // = AUTHOR
-//    Irfan Pyarali (irfan@cs.wustl.edu)
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -26,11 +25,6 @@
 
 ACE_RCSID(tests, Simple_Message_Block_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 int
 main (int, ASYS_TCHAR *[])
 {
diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp
index b38673605c1..31c1f4a1eda 100644
--- a/tests/Svc_Handler_Test.cpp
+++ b/tests/Svc_Handler_Test.cpp
@@ -24,11 +24,6 @@
 
 ACE_RCSID(tests, Svc_Handler_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 typedef ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
 
 static void
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index 2d044bed8a4..81e783b828d 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -16,7 +16,7 @@
 //     in the Errno class.
 //
 // = AUTHOR
-//    Prashant Jain and Doug Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -28,11 +28,6 @@
 
 ACE_RCSID(tests, TSS_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 static u_int errors = 0;
 
 #if defined (ACE_HAS_THREADS)
diff --git a/tests/Task_Test.cpp b/tests/Task_Test.cpp
index 97fe044c3c8..23e746b2bc9 100644
--- a/tests/Task_Test.cpp
+++ b/tests/Task_Test.cpp
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Task_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 class My_Thread_Hook : public ACE_Thread_Hook
diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index c6f7b7423cf..ef71f96e00d 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -26,11 +26,6 @@
 
 ACE_RCSID(tests, Thread_Manager_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Each thread keeps track of whether it has been signalled by using a
diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp
index e65de696341..b801ccc8250 100644
--- a/tests/Thread_Mutex_Test.cpp
+++ b/tests/Thread_Mutex_Test.cpp
@@ -14,7 +14,7 @@
 //      command line arguments are needed to run the test.
 //
 // = AUTHOR
-//    Prashant Jain and Doug Schmidt
+//    Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Thread_Mutex_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 static void *
 test (void *args)
diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp
index 66ff5199632..276f0be0021 100644
--- a/tests/Thread_Pool_Reactor_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Test.cpp
@@ -48,11 +48,6 @@
 
 ACE_RCSID(tests, Atomic_Op_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 #include "tests/Thread_Pool_Reactor_Test.h"
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index e1097b2fc34..68fa98bab5b 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -29,11 +29,6 @@
 
 ACE_RCSID(tests, Thread_Pool_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Number of iterations to run the test.
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index 4b2ae7f4302..d88510e6076 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -26,11 +26,6 @@
 
 ACE_RCSID(tests, Time_Service_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #define APPLICATION \
 ACE_TEXT ("..") ACE_DIRECTORY_SEPARATOR_STR \
 ACE_TEXT ("netsvcs") ACE_DIRECTORY_SEPARATOR_STR \
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp
index ff2e208f009..d5d7007ec93 100644
--- a/tests/Time_Value_Test.cpp
+++ b/tests/Time_Value_Test.cpp
@@ -15,7 +15,7 @@
 //      this seems like a reasonable place to test it.
 //
 // = AUTHOR
-//    Prashant Jain and David Levine
+//    Prashant Jain <pjain@cs.wustl.edu> and David Levine <levine@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -48,11 +48,6 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$")
 #include "test_config.h"
 #include "ace/ACE.h"
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T)
 static
 u_long
diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp
index 4b229d2e54e..9fb2ab7a77d 100644
--- a/tests/Timeprobe_Test.cpp
+++ b/tests/Timeprobe_Test.cpp
@@ -12,7 +12,7 @@
 //      This is a simple test of ACE Timeprobes.
 //
 // = AUTHOR
-//    Irfan Pyarali
+//    Irfan Pyarali <irfan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -25,11 +25,6 @@
 
 ACE_RCSID(tests, Timeprobe_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *events_descriptions_0[] =
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index aff963cec17..dfaa41b605f 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -34,11 +34,6 @@
 
 ACE_RCSID(tests, Timer_Queue_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 template <class T> void
 randomize_array (T array[], size_t size)
 {
diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp
index 82ec6f23b51..e4c2576400a 100644
--- a/tests/TkReactor_Test.cpp
+++ b/tests/TkReactor_Test.cpp
@@ -21,7 +21,7 @@
 //      No command line arguments are needed to run the test.
 //
 // = AUTHOR
-//    Nagarajan Surendran (naga@cs.wustl.edu)
+//    Nagarajan Surendran <naga@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -29,11 +29,6 @@
 
 ACE_RCSID(tests, TkReactor_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if !defined (ACE_HAS_TK)
 
 int main (int, char*[])
diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp
index d6678b9a168..528932d7cb0 100644
--- a/tests/Tokens_Test.cpp
+++ b/tests/Tokens_Test.cpp
@@ -21,7 +21,7 @@
 //     test remotely.
 //
 // = AUTHOR
-//    Tim Harrison
+//    Tim Harrison <harrison@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -36,11 +36,6 @@
 
 ACE_RCSID(tests, Tokens_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Token_Invariant_Manager TOKEN_INVARIANTS;
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index 4401fc202d8..7e2d2397d7e 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -9,11 +9,13 @@
 //    UPIPE_SAP_Test.cpp
 //
 // = DESCRIPTION
-//      This is a test that uses ACE_UPIPE_SAP and ACE_Thread for
+//      This is a test that uses <ACE_UPIPE_SAP> and <ACE_Thread> for
 //      intra-process communication.
 //
 // = AUTHOR
-//    Gerhard Lenzer, Douglas C. Schmidt, and Prashant Jain
+//    Gerhard Lenzer <Gerhard.Lenzer@med.siemens.de>,
+//    Douglas C. Schmidt <schmidt@cs.wustl.edu>, and 
+//    Prashant Jain <pjain@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -24,11 +26,6 @@
 
 ACE_RCSID(tests, UPIPE_SAP_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
         (defined (ACE_WIN32) && \
          defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index 791b6d89d1b..bc1e4193218 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -23,11 +23,6 @@
 
 ACE_RCSID(tests, Upgradable_RW_Test, "$Id$")
 
-#if defined (__BORLANDC__) && __BORLANDC__ >= 0x0530
-  USELIB ("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_THREADS)
 
 // Default number of iterations.
diff --git a/tests/XtReactor_Test.cpp b/tests/XtReactor_Test.cpp
index dd40820c6a0..6660fe777cf 100644
--- a/tests/XtReactor_Test.cpp
+++ b/tests/XtReactor_Test.cpp
@@ -29,11 +29,6 @@
 
 ACE_RCSID(tests, XtReactor_Test, "$Id$")
 
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 #if defined (ACE_HAS_XT)
 
 #include <ace/XtReactor.h>
diff --git a/tests/test_config.h b/tests/test_config.h
index 0d07b378b4a..b8252080091 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -32,11 +32,6 @@
 #undef ACE_NLOGGING
 #endif /* ACE_NLOGGING */
 
-/* Borland C++ Builder stuff */
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-#include /**/ <condefs.h>
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
 // This first #undef protects against command-line definitions.
 #undef ACE_NDEBUG
 #include "ace/OS.h"