diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-11-30 08:40:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-11-30 08:40:54 +0000 |
| commit | 0f000d1a60db53df465489713c93b1e4fd8e196b (patch) | |
| tree | 1436f56018548c09c6d3e76844ef85022eab1814 | |
| parent | 83d4ab706bd134a1193be63b35846fc9cba129af (diff) | |
| download | ATCD-0f000d1a60db53df465489713c93b1e4fd8e196b.tar.gz | |
ChangeLogTag: Tue Nov 30 08:38:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_App/FT_Client.cpp | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d060712973d..7b294e50d83 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 30 08:38:12 UTC 2004 Martin Corino <mcorino@remedy.nl> + + * orbsvcs/tests/FT_App/FT_Client.cpp: + Fixed compile problems. + Mon Nov 29 21:57:06 MST 2004 Scott Harris <harris_s@ociweb.com> * examples/Load_Balancing_persistent/Identity_Client.cpp: @@ -6,7 +11,7 @@ Mon Nov 29 21:57:06 MST 2004 Scott Harris <harris_s@ociweb.com> * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp: * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp: - Removed extra commas after ACE_TEXT macros that should + Removed extra commas after ACE_TEXT macros that should not have been there because the strings should have been concatenated. Originally found a bad log output and searched for other similar problems. diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 67c1bce1114..7a82ccf18ad 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -77,8 +77,8 @@ private: FTClientMain::FTClientMain () - : commandIn_(stdin) - , inFile_(0) + : inFile_(0) + , commandIn_(stdin) , verbose_(NORMAL) , replica_pos_(0) , replica_name_("none") @@ -255,7 +255,7 @@ int FTClientMain::pass ( if (this->verbose_ >= NOISY) { - ACE_OS::fprintf (stdout, "FT Client: %s\n", command); + ACE_OS::fprintf (stdout, "FT Client: %s\n", command.c_str()); } // turn echo on (based on verbose) @@ -475,7 +475,7 @@ int FTClientMain::pass ( { if (op != '?') { - ACE_OS::fprintf (stdout, "FT Client: Unknown: %s\n", command); + ACE_OS::fprintf (stdout, "FT Client: Unknown: %s\n", command.c_str()); } commandUsage(stderr); break; @@ -601,7 +601,7 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL) ACE_OS::fprintf (stdout, "FT Client: Last command may have completed. Retrying anyway.\n"); } retry = 1; - ACE_OS::fprintf (stdout, "FT Client: Retrying command: %s\n", command); + ACE_OS::fprintf (stdout, "FT Client: Retrying command: %s\n", command.c_str()); } } if (! handled) |