Cleaned up compilation in TAO_IDL, added ACE_RCSID to TAO/Benchmark/

22 files changed, 42 insertions, 1 deletions

diff --git a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
index 80c62f5e6a7..d3ef24fadc0 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
+++ b/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
@@ -3,6 +3,8 @@
 #include "benchmark/driver.h"
 #include "orbix_marshal_client.h"
 
+ACE_RCSID(Orbix, client, "$Id$")
+
 int main (int argc, char *argv [])
 {
   // instantiate a DRIVER with the Orbix_Client_Proxy as the template
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
index c4791df7661..4e07d507a8b 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
+++ b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #ifndef marshal_h
 #define marshal_h
 
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
index a42fee980f7..fcd4aead376 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
+++ b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
@@ -20,6 +20,8 @@
 #include "orbix_marshal_client.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(Orbix, orbix_marshal_client, "$Id$")
+
 int
 Orbix_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
 				CORBA_Marshal_Proxy::RESULTS &results)
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
index 6ef34f0d8bd..282d9e4f309 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
+++ b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
@@ -6,6 +6,8 @@
 #include "orbix_marshal_impl.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(Orbix, orbix_marshal_impl, "$Id$")
+
 // All the methods of the SSI class
 void
 Marshal_SSI_Impl::test_short (CORBA::Short s1,
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
index 33ea3dcd535..205287577c1 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
+++ b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
@@ -21,6 +21,8 @@
 #include "orbix_marshal_server.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(Orbix, orbix_marshal_server, "$Id$")
+
 int
 Orbix_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
 				CORBA_Marshal_Proxy::RESULTS &results)
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
index 510ee107a5e..9a0696645d8 100644
--- a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
+++ b/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
@@ -3,6 +3,8 @@
 #include "benchmark/driver.h"
 #include "orbix_marshal_server.h"
 
+ACE_RCSID(Orbix, server, "$Id$")
+
 int main (int argc, char *argv [])
 {
   // instantiate a DRIVER with the Orbix_Client_Proxy as the template
diff --git a/TAO/Benchmark/Marshal_Test/TAO/client.cpp b/TAO/Benchmark/Marshal_Test/TAO/client.cpp
index 9edd07784db..88cd1518329 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/client.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/client.cpp
@@ -3,6 +3,8 @@
 #include "benchmark/driver.h"
 #include "tao_marshal_client.h"
 
+ACE_RCSID(TAO, client, "$Id$")
+
 int main (int argc, char *argv [])
 {
   // instantiate a DRIVER with the Tao_Client_Proxy as the template
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
index 1557f836df9..dbef556e5b3 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
@@ -3,6 +3,8 @@
 #include <stdio.h>
 #include "marshalC.h"
 
+ACE_RCSID(TAO, marshalC, "$Id$")
+
 // constructor
 Marshal::Marshal(STUB_Object *refdata)
   : CORBA_Object(refdata)
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
index fe116a642b0..a13e4881d2c 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
@@ -3,6 +3,8 @@
 #include <iostream.h>
 #include "marshalS.h"
 
+ACE_RCSID(TAO, marshalS, "$Id$")
+
 static const TAO_operation_db_entry Marshal_operations[] = {
   {"_is_a", &_skel_Marshal::_Marshal_is_a_skel},
   { "test_short", &_skel_Marshal::_Marshal_test_short_skel},
diff --git a/TAO/Benchmark/Marshal_Test/TAO/server.cpp b/TAO/Benchmark/Marshal_Test/TAO/server.cpp
index 53102d6e189..a992752cda8 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/server.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/server.cpp
@@ -3,6 +3,8 @@
 #include "benchmark/driver.h"
 #include "tao_marshal_server.h"
 
+ACE_RCSID(TAO, server, "$Id$")
+
 int main (int argc, char *argv [])
 {
   // instantiate a DRIVER with the Tao_Client_Proxy as the template
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
index bd678bfad9a..93e1d0360cd 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
@@ -21,6 +21,8 @@
 #include "tao_marshal_client.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(TAO, tao_marshal_client, "$Id$")
+
 int
 Tao_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
 				CORBA_Marshal_Proxy::RESULTS &results)
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
index d4d555d5dee..5db657f60fd 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
@@ -6,6 +6,8 @@
 #include "tao_marshal_impl.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(TAO, tao_marshal_impl, "$Id$")
+
 // All the methods of the SSI class
 void
 Marshal_SSI_Impl::test_short (CORBA_Short s1,
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
index fea710364a6..9966b292e7f 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
@@ -21,6 +21,8 @@
 #include "tao_marshal_server.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(TAO, tao_marshal_server, "$Id$")
+
 int
 Tao_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
 				CORBA_Marshal_Proxy::RESULTS &results)
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
index 76218a98e84..fca289e19e4 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
@@ -3,6 +3,8 @@
 #include "benchmark/driver.h"
 #include "visi_marshal_client.h"
 
+ACE_RCSID(VisiBroker, client, "$Id$")
+
 int main (int argc, char *argv [])
 {
   // instantiate a DRIVER with the Visi_Client_Proxy as the template
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
index c77676fefc3..edb0dd286ff 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
@@ -3,6 +3,8 @@
 #include "benchmark/driver.h"
 #include "visi_marshal_server.h"
 
+ACE_RCSID(VisiBroker, server, "$Id$")
+
 int main (int argc, char *argv [])
 {
   // instantiate a DRIVER with the Visi_Client_Proxy as the template
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
index 2b185405543..a7719ad647a 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
@@ -19,6 +19,8 @@
 #include "visi_marshal_client.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(VisiBroker, visi_marshal_client, "$Id$")
+
 int
 Visi_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
 				CORBA_Marshal_Proxy::RESULTS &results)
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
index 29d8a82d289..d9425e9c4b3 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
@@ -6,6 +6,8 @@
 #include "visi_marshal_impl.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(VisiBroker, visi_marshal_impl, "$Id$")
+
 // All the methods of the SSI class
 void
 Marshal_SSI_Impl::test_short (CORBA::Short s1,
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
index 334c80f30cd..def599b3a02 100644
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
+++ b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
@@ -19,6 +19,8 @@
 #include "visi_marshal_server.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(VisiBroker, visi_marshal_server, "$Id$")
+
 int
 Visi_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
 				CORBA_Marshal_Proxy::RESULTS &results)
diff --git a/TAO/Benchmark/benchmark/driver.cpp b/TAO/Benchmark/benchmark/driver.cpp
index ab9c67a3981..2569f03ad56 100644
--- a/TAO/Benchmark/benchmark/driver.cpp
+++ b/TAO/Benchmark/benchmark/driver.cpp
@@ -2,6 +2,8 @@
 
 #include "benchmark/driver.h"
 
+ACE_RCSID(benchmark, driver, "$Id$")
+
 template <class T>
 CORBA_Benchmark_Driver<T>::CORBA_Benchmark_Driver (T *proxy)
   : proxy_ (proxy)
diff --git a/TAO/Benchmark/benchmark/marshal_options.cpp b/TAO/Benchmark/benchmark/marshal_options.cpp
index 1ff157826b2..93fb039be0c 100644
--- a/TAO/Benchmark/benchmark/marshal_options.cpp
+++ b/TAO/Benchmark/benchmark/marshal_options.cpp
@@ -20,6 +20,8 @@
 #include "benchmark/marshal_options.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(benchmark, marshal_options, "$Id$")
+
 static char *usage_string = 
 "Marshal_Test available options: \n\
 -d                      : set debug ON \n\
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.cpp b/TAO/Benchmark/benchmark/marshal_proxy.cpp
index 7a5a05e9a7a..9c2d4cf61d8 100644
--- a/TAO/Benchmark/benchmark/marshal_proxy.cpp
+++ b/TAO/Benchmark/benchmark/marshal_proxy.cpp
@@ -19,3 +19,5 @@
 #include "benchmark/marshal_proxy.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(benchmark, marshal_proxy, "$Id$")
+
diff --git a/TAO/Benchmark/benchmark/marshal_results.cpp b/TAO/Benchmark/benchmark/marshal_results.cpp
index 1231fe38b22..1c102d49eed 100644
--- a/TAO/Benchmark/benchmark/marshal_results.cpp
+++ b/TAO/Benchmark/benchmark/marshal_results.cpp
@@ -19,6 +19,8 @@
 #include "benchmark/marshal_results.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(benchmark, marshal_results, "$Id$")
+
 int 
 CORBA_Marshal_Results::log_results (void)
 {