summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornshankar <nshankar@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-05 17:00:14 +0000
committernshankar <nshankar@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-05 17:00:14 +0000
commitaa82d8a4d52a8086557b52a827f142778a6d2be0 (patch)
tree7c8a80490de6333fb58ce4d96cf3b01b60aa721e
parent0c9d703e48ab8bb6bd5b9a7ebfd1129faf6089e9 (diff)
downloadATCD-aa82d8a4d52a8086557b52a827f142778a6d2be0.tar.gz
Fri May 5 16:58:17 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog9
-rw-r--r--TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp5
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index c3de881f81b..b6e290a171c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,9 +1,14 @@
+Fri May 5 16:58:17 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu>
+
+ * DAnCE/ExecutionManager/Execution_Manager.cpp (CIAO): Fixed the
+ parsing of command line options.
+
Thu May 4 21:35:01 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/Config_Handlers/ADD_Handler.cpp
* tools/Config_Handlers/DP_Handler.cpp
-
- Fixed a reverse handler bug.
+
+ Fixed a reverse handler bug.
Thu May 4 08:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 9cf69544075..545da80c14b 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -26,7 +26,7 @@ namespace CIAO
bool
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:m:i:n:p");
+ ACE_Get_Opt get_opts (argc, argv, "o:i:np:");
int c;
while ((c = get_opts ()) != -1)
switch (c)
@@ -51,6 +51,7 @@ namespace CIAO
"-o <ior_output_file>\n"
"-i <installation data filename>\n"
"-n <use naming service>\n"
+ "-p <filename to output the process id>\n"
"\n",
argv [0]),
false);
@@ -201,7 +202,7 @@ namespace CIAO
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
-
+
if (write_to_ior_)
{
retval =