ChangeLogTag: Thu Aug 14 17:42:02 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

41 files changed, 128 insertions, 42 deletions

diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index e07395d9d51..242e15a391d 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -20,7 +20,9 @@
 #include "any.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Param_Test, any, "$Id$")
+ACE_RCSID (Param_Test, 
+           any, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Any
@@ -52,7 +54,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("o1") <<= this->in_;
   req->add_inout_arg ("o2") <<= this->inout_;
-  req->add_out_arg ("o3");
+  req->add_out_arg ("o3") <<= this->out_.in ();
 
   req->set_return_type (CORBA::_tc_any);
 
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 7bf7c6936b5..9c2b6ea098e 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -19,6 +19,10 @@
 #include "helper.h"
 #include "bd_array_seq.h"
 
+ACE_RCSID (Param_Test, 
+           bd_array_seq, 
+           "$Id$")
+
 const CORBA::ULong MAX_ARRAYSEQ_LEN = 1;
 
 // ************************************************************************
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 38bb0ed35ee..44be6ed3932 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_long_seq.h"
 
-ACE_RCSID(Param_Test, bd_long_seq, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_long_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Bounded_Long_Sequence
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 55f08c06789..0faa3656552 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_short_seq.h"
 
-ACE_RCSID(Param_Test, bd_short_seq, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_short_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Bounded_Short_Sequence
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 1ca7bb06806..5d542556fa8 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_str_seq.h"
 
-ACE_RCSID(Param_Test, bd_str_seq, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_str_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Bounded_String_Sequence
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index ce603643567..149ac604a6a 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_string.h"
 
-ACE_RCSID(Param_Test, bd_string, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_string, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Bounded_String
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index f382a7badbe..1c2593b9f40 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_struct_seq.h"
 
-ACE_RCSID(Param_Test, bd_struct_seq, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_struct_seq, 
+           "$Id$")
 
 const CORBA::ULong MAX_STRUCTSEQ_LEN = 1;
 
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 3c5c065af16..b2c26af2c47 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_wstr_seq.h"
 
-ACE_RCSID(Param_Test, bd_wstr_seq, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_wstr_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Bounded_WString_Sequence
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index 3d94454d818..8854d1ea9bc 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "bd_wstring.h"
 
-ACE_RCSID(Param_Test, bd_wstring, "$Id$")
+ACE_RCSID (Param_Test, 
+           bd_wstring, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Bounded_WString
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index d63460e7eeb..80cc17e1707 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "big_union.h"
 
-ACE_RCSID(Param_Test, big_union, "$Id$")
+ACE_RCSID (Param_Test, 
+           big_union, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Big_Union
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 32d395ade12..c9dbc510400 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -20,11 +20,13 @@
 #include "complex_any.h"
 #include "tao/debug.h"
 
+ACE_RCSID (Param_Test, 
+           complex_any, 
+           "$Id$")
+
 const int LEVEL_2_LENGTH = 5;
 const int LEVEL_3_LENGTH = 3;
 
-ACE_RCSID(Param_Test, complex_any, "$Id$")
-
 // ************************************************************************
 //               Test_Complex_Any
 // ************************************************************************
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index ba14469be30..834d8adc6b0 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -22,7 +22,9 @@
 #include "tests.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Param_Test, driver, "$Id$")
+ACE_RCSID (Param_Test,
+           driver, 
+           "$Id$")
 
 // This function runs the test (main program)
 int
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index b535f380dbf..c910bfcf0f2 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -22,7 +22,9 @@
 
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 
-ACE_RCSID(Param_Test, except, "$Id$")
+ACE_RCSID (Param_Test, 
+           except, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Exception
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index 02eb437af97..a8e5fe0f82a 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "fixed_array.h"
 
-ACE_RCSID(Param_Test, fixed_array, "$Id$")
+ACE_RCSID (Param_Test, 
+           fixed_array, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Fixed_Array
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 669c7a9e7f8..9447fbf88a1 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "fixed_struct.h"
 
-ACE_RCSID(Param_Test, fixed_struct, "$Id$")
+ACE_RCSID (Param_Test, 
+           fixed_struct, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Fixed_Struct
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
index 544524a8263..e5ed5c2c934 100644
--- a/TAO/tests/Param_Test/helper.cpp
+++ b/TAO/tests/Param_Test/helper.cpp
@@ -21,7 +21,9 @@
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
-ACE_RCSID(Param_Test, helper, "$Id$")
+ACE_RCSID (Param_Test,
+           helper, 
+           "$Id$")
 
 Generator::Generator (void)
 {
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index ee238011542..69b3f3e8f3a 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -18,7 +18,9 @@
 #include "multdim_array.h"
 
 
-ACE_RCSID(Param_Test, fixed_array, "$Id$")
+ACE_RCSID (Param_Test, 
+           multdim_array, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Multdim_Array
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 488a0535902..b48b8ef65ed 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "nested_struct.h"
 
-ACE_RCSID(Param_Test, nested_struct, "$Id$")
+ACE_RCSID (Param_Test,
+           nested_struct, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Nested_Struct
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 8a67d0ff3e7..4b0986404b4 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "objref.h"
 
-ACE_RCSID(Param_Test, objref, "$Id$")
+ACE_RCSID (Param_Test,
+           objref, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_ObjRef
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 75a83b0d7d0..c299f461a8a 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "objref_struct.h"
 
-ACE_RCSID(Param_Test, objref_struct, "$Id$")
+ACE_RCSID (Param_Test,
+           objref_struct, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Objref_Struct
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index 28f870cc7a8..0def06a0ba5 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -21,7 +21,9 @@
 #include "ace/Read_Buffer.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Param_Test, options, "$Id$")
+ACE_RCSID (Param_Test,
+           options, 
+           "$Id$")
 
 // Constructor.p
 Options::Options (void)
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index dd39fc19b52..338740481c2 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -17,7 +17,9 @@
 #include "tao/corba.h"
 #include "tao/debug.h"
 
-ACE_RCSID(Param_Test, param_test_i, "$Id$")
+ACE_RCSID (Param_Test,
+           param_test_i, 
+           "$Id$")
 
 // ********* class Coffee_i ****************
 // Constructor
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 1e4f34d3f65..18d49fd2779 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -18,7 +18,9 @@
 
 #include "recursive_struct.h"
 
-ACE_RCSID(Param_Test, recursive_struct, "$Id$")
+ACE_RCSID (Param_Test,
+           recursive_struct, 
+           "$Id$")
 
 const CORBA::ULong MAX_DEPTH = 5;
 const CORBA::ULong MAX_SEQ_LENGTH = 3;
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 0f455ac9665..5fc3c86506f 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -18,7 +18,9 @@
 
 #include "recursive_union.h"
 
-ACE_RCSID(Param_Test, recursive_union, "$Id$")
+ACE_RCSID (Param_Test,
+           recursive_union, 
+           "$Id$")
 
 const CORBA::ULong MAX_DEPTH = 3;
 const CORBA::ULong MAX_SEQ_LENGTH = 2;
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 481e82837e3..b2a12a29bd5 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -20,7 +20,9 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Param_Test, results, "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp")
+ACE_RCSID (Param_Test,
+           results, 
+           "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp")
 
 Results::Results (void)
 {
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 68d02b1db10..adaa7219c30 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "short.h"
 
-ACE_RCSID(Param_Test, short, "$Id$")
+ACE_RCSID (Param_Test, 
+           short, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Short
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 6c05b360cbb..d1065cb4f29 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "small_union.h"
 
-ACE_RCSID(Param_Test, small_union, "$Id$")
+ACE_RCSID (Param_Test,
+           small_union, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Small_Union
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index c559ce739e3..551ef486f39 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "typecode.h"
 
-ACE_RCSID(Param_Test, typecode, "$Id$")
+ACE_RCSID (Param_Test,
+           typecode, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_TypeCode
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index e755c773a7f..20a0b010fd4 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -20,11 +20,13 @@
 #include "ub_any_seq.h"
 #include "tao/debug.h"
 
+ACE_RCSID (Param_Test,
+           ub_any_seq, 
+           "$Id$")
+
 const CORBA::ULong TEST_SEQ_LENGTH = 5;
 const CORBA::ULong NUM_TEST_TYPES = 4;
 
-ACE_RCSID(Param_Test, ub_any_seq, "$Id$")
-
 // ************************************************************************
 //               Test_AnySeq
 // ************************************************************************
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index c662ac224c4..104c4885c74 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -19,6 +19,10 @@
 #include "helper.h"
 #include "ub_array_seq.h"
 
+ACE_RCSID (Param_Test, 
+           ub_array_seq, 
+           "$Id$")
+
 // ************************************************************************
 //               Test_Array_Sequence
 // ************************************************************************
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index d14d272722c..b5dddc00240 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_long_seq.h"
 
-ACE_RCSID(Param_Test, ub_long_seq, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_long_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Long_Sequence
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 15e8b9a6cba..d15d6f0baac 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_objref_seq.h"
 
-ACE_RCSID(Param_Test, ub_objref_seq, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_objref_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_ObjRef_Sequence
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 519c5687ee6..3252540f1cd 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_short_seq.h"
 
-ACE_RCSID(Param_Test, ub_short_seq, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_short_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Short_Sequence
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 8d85803ab37..952909f327d 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_str_seq.h"
 
-ACE_RCSID(Param_Test, ub_str_seq, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_str_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_String_Sequence
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index f378c212fa6..1392df320c0 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_string.h"
 
-ACE_RCSID(Param_Test, ub_string, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_string, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Unbounded_String
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index cbf69675ddc..805ecf71579 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_struct_seq.h"
 
-ACE_RCSID(Param_Test, ub_struct_seq, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_struct_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Struct_Sequence
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index d5494df60fa..8c0f1eba65c 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_wstr_seq.h"
 
-ACE_RCSID(Param_Test, ub_wstr_seq, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_wstr_seq, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_WString_Sequence
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index bfb398c2259..b6cd67b170e 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ub_wstring.h"
 
-ACE_RCSID(Param_Test, ub_wstring, "$Id$")
+ACE_RCSID (Param_Test,
+           ub_wstring, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Unbounded_WString
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index e491c76d9f2..d8104652da1 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "ulonglong.h"
 
-ACE_RCSID(Param_Test, ulonglong, "$Id$")
+ACE_RCSID (Param_Test,
+           ulonglong, 
+           "$Id$")
 
 Test_ULongLong::Test_ULongLong (void)
   : opname_ (CORBA::string_dup ("test_ulonglong"))
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 997600b7479..f07192921e5 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "var_array.h"
 
-ACE_RCSID(Param_Test, var_array, "$Id$")
+ACE_RCSID (Param_Test,
+           var_array, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Var_Array
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index ff644037acc..679ed7b3db3 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -19,7 +19,9 @@
 #include "helper.h"
 #include "var_struct.h"
 
-ACE_RCSID(Param_Test, var_struct, "$Id$")
+ACE_RCSID (Param_Test,
+           var_struct, 
+           "$Id$")
 
 // ************************************************************************
 //               Test_Var_Struct