diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-12 01:30:31 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-12 01:30:31 +0000 |
| commit | 5eed071e4fb4c8bfdeb9927a3e496e35a171a6d8 (patch) | |
| tree | 14fa02b6d3b1b4ae50b255947aef07b57bae15fa | |
| parent | 75521daef24b5e860ca1f992b49799767e71bdeb (diff) | |
| download | ATCD-5eed071e4fb4c8bfdeb9927a3e496e35a171a6d8.tar.gz | |
ChangeLogTag: Tue Nov 11 19:30:02 2003 Dale Wilson <wilson_d@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_App/FT_Creator.cpp | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d135cc02115..80e323b88e1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 11 19:30:02 2003 Dale Wilson <wilson_d@ociweb.com> + + * orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp: + * orbsvcs/tests/FT_App/FT_Creator.cpp: + * orbsvcs/tests/FT_App/StubFaultNotifier.h: + More cleaning: unused args, missing in()s. + Tue Nov 11 18:41:46 2003 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/tests/FT_App/StubFaultNotifier.cpp: diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp index 304882a6ccb..562932ef61b 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp @@ -13,8 +13,8 @@ */ //============================================================================= -#include <tao/Utils/Server_Main.h> #include "StubFaultNotifier.h" +#include <tao/Utils/Server_Main.h> int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index f0cf1e09e48..e9f32a02cdd 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -21,14 +21,16 @@ FTAPP::FT_Creator::FT_Creator () - : registry_ior_ (0) + : orb_ (0) + , registry_ior_ (0) , registry_ (0) + , naming_context_ () , replication_manager_ (0) , have_replication_manager_ (0) , write_iors_ (0) , write_iogr_ (0) - , iogr_seq_ (0) , ns_register_ (1) + , iogr_seq_ (0) , prefix_ ("") { } @@ -181,7 +183,7 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL) if (this->write_iogr_) { - CORBA::String_var iogr = this->orb_->object_to_string (group ACE_ENV_ARG_PARAMETER); + CORBA::String_var iogr = this->orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); char iogr_filename[1000]; @@ -225,9 +227,9 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL) } typeCount = this->unregister_roles_.size(); - for ( nType = 0; result == 0 && nType < typeCount; ++nType) + for ( size_t nUnreg = 0; result == 0 && nUnreg < typeCount; ++nUnreg) { - const char * role = this->unregister_roles_[nType].c_str(); + const char * role = this->unregister_roles_[nUnreg].c_str(); result = this->creator_.unregister_role (role); } diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h index 340e6a971f6..38a285cdce6 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h @@ -17,8 +17,6 @@ ////////////////////// // Forward references -class TAO_ORB_Manager; - ///////////////////// // Class declarations |