*** empty log message ***

7 files changed, 43 insertions, 30 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6795bd83516..a148dfd8ab3 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,22 @@
+Fri Sep 26 12:13:44 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl:
+	  Changed to deploy Test-IOR.cad instead of
+	  Test-Name-Service.cad.
+
+	* performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h:
+	* performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h:
+	  Fixed some extra line-breaks that were causing compilation errors.
+
+	* performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp:
+	  Fixed a compilation error.
+
+	* performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc:
+	  Removed a redundant comma.
+
+	* tools/ComponentServer/ComponentServer.cpp:
+	  Fixed execution error in "debug mode."
+
 Wed Sep 24 20:59:09 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* examples/handcrafted/BasicSP_EC2/EC/EC.mpc: Fixed problems that
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index d39675655d7..c4f6c586c06 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -74,7 +74,7 @@ MyImpl::RoundTripClient_exec_i::start ()
   ACE_Sample_History history (niterations);
 
   ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
+  for (i = 0; i < niterations; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h
index 08ce8e250db..1020507fdff 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_stub_export.h
@@ -5,31 +5,29 @@
 // ------------------------------
 #ifndef ROUNDTRIPCLIENT_STUB_EXPORT_H
 #define ROUNDTRIPCLIENT_STUB_EXPORT_H
- 
+
 #include "ace/config-all.h"
- 
+
 #if !defined (ROUNDTRIPCLIENT_STUB_HAS_DLL)
 #  define ROUNDTRIPCLIENT_STUB_HAS_DLL 1
 #endif /* ! ROUNDTRIPCLIENT_STUB_HAS_DLL */
- 
+
 #if defined (ROUNDTRIPCLIENT_STUB_HAS_DLL) && (ROUNDTRIPCLIENT_STUB_HAS_DLL == 1)
 #  if defined (ROUNDTRIPCLIENT_STUB_BUILD_DLL)
 #    define ROUNDTRIPCLIENT_STUB_Export ACE_Proper_Export_Flag
 #    define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* ROUNDTRIPCLIENT_STUB_BUILD_DLL */
 #    define ROUNDTRIPCLIENT_STUB_Export ACE_Proper_Import_Flag
 #    define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* ROUNDTRIPCLIENT_STUB_BUILD_DLL */
 #else /* ROUNDTRIPCLIENT_STUB_HAS_DLL == 1 */
 #  define ROUNDTRIPCLIENT_STUB_Export
 #  define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARATION(T)
 #  define ROUNDTRIPCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #endif /* ROUNDTRIPCLIENT_STUB_HAS_DLL == 1 */
- 
+
 // Set ROUNDTRIPCLIENT_STUB_NTRACE = 0 to turn on library specific tracing even if
 // tracing is turned off for ACE.
 #if !defined (ROUNDTRIPCLIENT_STUB_NTRACE)
@@ -39,14 +37,13 @@ ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #    define ROUNDTRIPCLIENT_STUB_NTRACE 0
 #  endif /* (ACE_NTRACE == 1) */
 #endif /* !ROUNDTRIPCLIENT_STUB_NTRACE */
- 
+
 #if (ROUNDTRIPCLIENT_STUB_NTRACE == 1)
 #  define ROUNDTRIPCLIENT_STUB_TRACE(X)
 #else /* (ROUNDTRIPCLIENT_STUB_NTRACE == 1) */
 #  define ROUNDTRIPCLIENT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
 #endif /* (ROUNDTRIPCLIENT_STUB_NTRACE == 1) */
- 
+
 #endif /* ROUNDTRIPCLIENT_STUB_EXPORT_H */
- 
-// End of auto generated file.
 
+// End of auto generated file.
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h
index 8888faad1d0..a760c548604 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_svnt_export.h
@@ -5,31 +5,29 @@
 // ------------------------------
 #ifndef ROUNDTRIPCLIENT_SVNT_EXPORT_H
 #define ROUNDTRIPCLIENT_SVNT_EXPORT_H
- 
+
 #include "ace/config-all.h"
- 
+
 #if !defined (ROUNDTRIPCLIENT_SVNT_HAS_DLL)
 #  define ROUNDTRIPCLIENT_SVNT_HAS_DLL 1
 #endif /* ! ROUNDTRIPCLIENT_SVNT_HAS_DLL */
- 
+
 #if defined (ROUNDTRIPCLIENT_SVNT_HAS_DLL) && (ROUNDTRIPCLIENT_SVNT_HAS_DLL == 1)
 #  if defined (ROUNDTRIPCLIENT_SVNT_BUILD_DLL)
 #    define ROUNDTRIPCLIENT_SVNT_Export ACE_Proper_Export_Flag
 #    define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* ROUNDTRIPCLIENT_SVNT_BUILD_DLL */
 #    define ROUNDTRIPCLIENT_SVNT_Export ACE_Proper_Import_Flag
 #    define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* ROUNDTRIPCLIENT_SVNT_BUILD_DLL */
 #else /* ROUNDTRIPCLIENT_SVNT_HAS_DLL == 1 */
 #  define ROUNDTRIPCLIENT_SVNT_Export
 #  define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARATION(T)
 #  define ROUNDTRIPCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #endif /* ROUNDTRIPCLIENT_SVNT_HAS_DLL == 1 */
- 
+
 // Set ROUNDTRIPCLIENT_SVNT_NTRACE = 0 to turn on library specific tracing even if
 // tracing is turned off for ACE.
 #if !defined (ROUNDTRIPCLIENT_SVNT_NTRACE)
@@ -39,14 +37,13 @@ ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #    define ROUNDTRIPCLIENT_SVNT_NTRACE 0
 #  endif /* (ACE_NTRACE == 1) */
 #endif /* !ROUNDTRIPCLIENT_SVNT_NTRACE */
- 
+
 #if (ROUNDTRIPCLIENT_SVNT_NTRACE == 1)
 #  define ROUNDTRIPCLIENT_SVNT_TRACE(X)
 #else /* (ROUNDTRIPCLIENT_SVNT_NTRACE == 1) */
 #  define ROUNDTRIPCLIENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
 #endif /* (ROUNDTRIPCLIENT_SVNT_NTRACE == 1) */
- 
+
 #endif /* ROUNDTRIPCLIENT_SVNT_EXPORT_H */
- 
-// End of auto generated file.
 
+// End of auto generated file.
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl
index 0989a9dc889..147390a80ee 100755
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl
@@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$ 
+# $Id$
 # -*- perl -*-
 
 #
@@ -28,7 +28,7 @@ $daemon_args = "-ORBEndpoint iiop://localhost:10000 -o $daemon_ior -i CIAO_Insta
 
 $assembly_manager_args = "-o $am_ior -c test.dat";
 
-$ad_args = " -k file://$am_ior -a Test-Name-Service.cad";
+$ad_args = " -k file://$am_ior -a Test-IOR.cad";
 
 # CIAO daemon process definition
 $DS = new PerlACE::Process ("$CIAO_ROOT/tools/Daemon/CIAO_Daemon",
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
index f9d501aa534..749b8913c82 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
@@ -1,7 +1,7 @@
 // $Id$
 project (RoundTripServer) : taoserver, strategies {
   Source_Files {
-    server.cpp,
+    server.cpp
     LatencyTest.cpp
   }
 }
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
index 9f5619fd958..3d25373f1bf 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
 
 
       Components::Deployment::ServerActivator_var activator;
-      Components::ConfigValues_var config;
+      Components::ConfigValues_var config = new Components::ConfigValues;
 
       if (use_callback)
         {
@@ -154,7 +154,7 @@ main (int argc, char *argv[])
         }
 
       comserv_servant->set_objref (activator.in (),
-                                   config.in (),
+                                   config,
                                    comserv_obj.in ()
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;