From 2019e9da707aeeaf20ff62699dd77bb569bf6f84 Mon Sep 17 00:00:00 2001 From: Abdullah Sowayan Date: Sun, 15 Jun 2008 01:30:50 +0000 Subject: Sun Jun 15 01:28:01 UTC 2008 Abdullah Sowayan --- TAO/ChangeLog | 35 ++++ .../Asynch_Three_Stage/Connection_Manager.cpp | 176 ++++++++++----------- .../AVStreams/Asynch_Three_Stage/distributer.cpp | 6 +- .../AVStreams/Asynch_Three_Stage/receiver.cpp | 6 +- .../tests/AVStreams/Asynch_Three_Stage/sender.cpp | 6 +- TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp | 19 ++- TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp | 4 +- .../AVStreams/Simple_Two_Stage/Receiver_Stats.cpp | 12 +- .../AVStreams/Simple_Two_Stage/Receiver_Stats.h | 4 +- .../tests/AVStreams/Simple_Two_Stage/receiver.cpp | 22 ++- .../tests/Bug_1630_Regression/testclient.cpp | 2 +- TAO/orbsvcs/tests/Bug_2248_Regression/client.h | 4 +- TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp | 2 +- TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp | 4 +- .../tests/COIOP_Naming_Test/Client_Task.cpp | 2 +- TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp | 32 ++-- TAO/orbsvcs/tests/FT_App/FT_Client.cpp | 48 +++--- TAO/orbsvcs/tests/FT_App/FT_Creator.cpp | 15 +- .../FT_App/FT_ReplicationManagerController.cpp | 8 +- .../ReplicationManagerFaultConsumerAdapter.cpp | 12 +- TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp | 12 +- .../Latency_Test/Latency_Query_Client.cpp | 2 +- .../Application_Controlled/client.cpp | 4 +- .../Application_Controlled/server.cpp | 60 +++---- .../Infrastructure_Controlled/Factory.cpp | 14 +- .../Infrastructure_Controlled/LB_server.cpp | 2 +- .../GenericFactory/Manage_Object_Group/server.cpp | 40 ++--- .../tests/LoadBalancing/LoadMonitor/CPU/client.cpp | 5 +- TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp | 6 +- .../Security/Bug_2908_Regression/Client_Task.cpp | 4 +- .../tests/Security/mixed_security_test/Foo_i.cpp | 10 +- 31 files changed, 304 insertions(+), 274 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index eb6677b0dd4..ba7f77f68bb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,38 @@ +Sun Jun 15 01:28:01 UTC 2008 Abdullah Sowayan + + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp: + * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: + * orbsvcs/tests/AVStreams/Pluggable/server.cpp: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp: + * orbsvcs/tests/Bug_1630_Regression/testclient.cpp: + * orbsvcs/tests/Bug_2248_Regression/client.h: + * orbsvcs/tests/Bug_2248_Regression/server.cpp: + * orbsvcs/tests/Bug_2248_Regression/test_i.cpp: + * orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp: + * orbsvcs/tests/FT_App/FT_Client.cpp: + * orbsvcs/tests/FT_App/FT_Creator.cpp: + * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp: + * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp: + * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp: + * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp: + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp: + * orbsvcs/tests/Log/Basic_Log_Test/client.cpp: + * orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp: + * orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp: + + Untabify. + Sat Jun 14 15:41:37 UTC 2008 Abdullah Sowayan * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp: diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index 3180ae3560f..c877200bac7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -18,8 +18,8 @@ Connection_Manager::load_ep_addr (const char* file_name) if (addr_file == 0) { ACE_ERROR ((LM_DEBUG, - "Cannot open addr file %s\n", - file_name)); + "Cannot open addr file %s\n", + file_name)); return; } else @@ -35,98 +35,98 @@ Connection_Manager::load_ep_addr (const char* file_name) /* int n = ACE_OS::fread (buf, - 1, - BUFSIZ, - addr_file); + 1, + BUFSIZ, + addr_file); */ if ((ACE_OS::fgets (buf,BUFSIZ,addr_file)) == 0) - { - // At end of file break the loop and end the sender. - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"End of Addr file\n")); - break; - } + { + // At end of file break the loop and end the sender. + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG,"End of Addr file\n")); + break; + } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "%s\n", - buf)); + ACE_DEBUG ((LM_DEBUG, + "%s\n", + buf)); Endpoint_Addresses* addr; ACE_NEW (addr, - Endpoint_Addresses); + Endpoint_Addresses); TAO_Tokenizer addr_tokenizer (buf,'/'); ACE_CString flowname; if (addr_tokenizer [0] == 0) - { - ACE_ERROR ((LM_ERROR, - "Corresponding flow name not specified for endpoint addresses\n")); - return; - } + { + ACE_ERROR ((LM_ERROR, + "Corresponding flow name not specified for endpoint addresses\n")); + return; + } else - flowname += addr_tokenizer [0]; + flowname += addr_tokenizer [0]; if (addr_tokenizer [1] != 0) - { - ACE_CString token (addr_tokenizer [1]); - - ACE_CString::size_type pos = token.find ('\r'); - if (pos != ACE_CString::npos) - { - addr->sender_addr = CORBA::string_dup ((token.substr (0, pos)).c_str ()); - } - else addr->sender_addr = CORBA::string_dup (token.c_str()); - - pos = addr->sender_addr.find ('\n'); - if (pos != ACE_CString::npos) - { - addr->sender_addr = (addr->sender_addr.substr (0, pos)).c_str (); - } - } + { + ACE_CString token (addr_tokenizer [1]); + + ACE_CString::size_type pos = token.find ('\r'); + if (pos != ACE_CString::npos) + { + addr->sender_addr = CORBA::string_dup ((token.substr (0, pos)).c_str ()); + } + else + addr->sender_addr = CORBA::string_dup (token.c_str()); + + pos = addr->sender_addr.find ('\n'); + if (pos != ACE_CString::npos) + { + addr->sender_addr = (addr->sender_addr.substr (0, pos)).c_str (); + } + } if (addr_tokenizer [2] != 0) - { - ACE_CString token (addr_tokenizer [2]); + { + ACE_CString token (addr_tokenizer [2]); ACE_CString::size_type pos = token.find ('\r'); - if (pos != ACE_CString::npos) - { - addr->receiver_addr = CORBA::string_dup ((token.substr (0, pos)).c_str ()); - } - else addr->receiver_addr = CORBA::string_dup (token.c_str()); - - pos = addr->receiver_addr.find ('\n'); - if (pos != ACE_CString::npos) - { - addr->receiver_addr = (addr->receiver_addr.substr (0, pos)).c_str (); - } - } + if (pos != ACE_CString::npos) + { + addr->receiver_addr = CORBA::string_dup ((token.substr (0,pos)).c_str ()); + } + else + addr->receiver_addr = CORBA::string_dup (token.c_str()); + + pos = addr->receiver_addr.find ('\n'); + if (pos != ACE_CString::npos) + { + addr->receiver_addr = (addr->receiver_addr.substr (0, pos)).c_str (); + } + } int result = ep_addr_.bind (flowname, - addr); + addr); if (result == 0) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Flowname %s Bound Successfully\n", - flowname.c_str ())); - } + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Flowname %s Bound Successfully\n", + flowname.c_str ())); + } else if (result == 1) - ACE_DEBUG ((LM_DEBUG, - "Flowname %s already exists\n", - flowname.c_str ())); - else ACE_DEBUG ((LM_DEBUG, - "Flowname %s Bound Failed\n", - flowname.c_str ())); - - + ACE_DEBUG ((LM_DEBUG, + "Flowname %s already exists\n", + flowname.c_str ())); + else + ACE_DEBUG ((LM_DEBUG, + "Flowname %s Bound Failed\n", + flowname.c_str ())); } - } int @@ -296,24 +296,24 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender) Endpoint_Addresses* addr = 0; ep_addr_.find (flowname, - addr); + addr); ACE_CString sender_addr_str; ACE_CString receiver_addr_str; if (addr != 0) - { - sender_addr_str = addr->sender_addr; - receiver_addr_str = addr->receiver_addr; - ACE_DEBUG ((LM_DEBUG, - "Address Strings %s %s\n", - sender_addr_str.c_str (), - receiver_addr_str.c_str ())); - - } - else ACE_DEBUG ((LM_DEBUG, - "No endpoint address for flowname %s\n", - flowname.c_str ())); + { + sender_addr_str = addr->sender_addr; + receiver_addr_str = addr->receiver_addr; + ACE_DEBUG ((LM_DEBUG, + "Address Strings %s %s\n", + sender_addr_str.c_str (), + receiver_addr_str.c_str ())); + } + else + ACE_DEBUG ((LM_DEBUG, + "No endpoint address for flowname %s\n", + flowname.c_str ())); ACE_INET_Addr receiver_addr (receiver_addr_str.c_str ()); ACE_INET_Addr sender_addr (sender_addr_str.c_str ()); @@ -337,8 +337,8 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Connection_Manager::connect_to_receivers Flow Spec Entry %s\n", - sender_entry.entry_to_string ())); + "Connection_Manager::connect_to_receivers Flow Spec Entry %s\n", + sender_entry.entry_to_string ())); // Create the stream control for this stream. TAO_StreamCtrl *streamctrl = 0; @@ -479,7 +479,7 @@ Connection_Manager::connect_to_sender (void) Endpoint_Addresses* addr = 0; ep_addr_.find (flowname, - addr); + addr); ACE_CString sender_addr_str; ACE_CString receiver_addr_str; @@ -490,9 +490,9 @@ Connection_Manager::connect_to_sender (void) receiver_addr_str = addr->receiver_addr; ACE_DEBUG ((LM_DEBUG, - "Address Strings %s %s\n", - sender_addr_str.c_str (), - receiver_addr_str.c_str ())); + "Address Strings %s %s\n", + sender_addr_str.c_str (), + receiver_addr_str.c_str ())); } ACE_INET_Addr receiver_addr (receiver_addr_str.c_str ()); @@ -518,8 +518,8 @@ Connection_Manager::connect_to_sender (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Connection_Manager::connect_to_sender Flow Spec Entry %s\n", - sender_entry.entry_to_string ())); + "Connection_Manager::connect_to_sender Flow Spec Entry %s\n", + sender_entry.entry_to_string ())); // Create the stream control for this stream TAO_StreamCtrl* streamctrl = 0; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index c817675b6ff..c36f57f65ba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -123,9 +123,9 @@ Distributer::parse_args (int argc, { switch (c) { - case 'a': - this->addr_file_ = opts.opt_arg (); - break; + case 'a': + this->addr_file_ = opts.opt_arg (); + break; case 's': this->sender_name_ = opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 509cde31e47..18d495f3f30 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -147,9 +147,9 @@ Receiver::parse_args (int argc, { switch (c) { - case 'a': - this->addr_file_ = opts.opt_arg (); - break; + case 'a': + this->addr_file_ = opts.opt_arg (); + break; case 'f': this->output_file_name_ = opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index 36d1fcab944..6ca19cfa5da 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -64,9 +64,9 @@ Sender::parse_args (int argc, { switch (c) { - case 'a': - this->addr_file_ = opts.opt_arg (); - break; + case 'a': + this->addr_file_ = opts.opt_arg (); + break; case 'f': this->filename_ = opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 8bb9e81a97b..33705b64a7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -118,11 +118,11 @@ Client::parse_args (int argc, break; case 'l': this->address_ = ACE_OS::strdup (opts.opt_arg ()); - l_addr = 1; + l_addr = 1; break; case 'a': this->peer_addr_ = ACE_OS::strdup (opts.opt_arg ()); - p_addr =1; + p_addr =1; break; case 'p': this->protocol_ = ACE_OS::strdup (opts.opt_arg ()); @@ -139,7 +139,7 @@ Client::parse_args (int argc, { char buf [BUFSIZ]; ACE_OS::hostname (buf, - BUFSIZ); + BUFSIZ); address_ = buf; address_ += ":5000"; } @@ -148,7 +148,7 @@ Client::parse_args (int argc, { char buf [BUFSIZ]; ACE_OS::hostname (buf, - BUFSIZ); + BUFSIZ); peer_addr_ = buf; peer_addr_ += ":5050"; } @@ -226,8 +226,8 @@ Client::init (int argc,char **argv) this->parse_args (this->argc_, this->argv_); - ACE_NEW_RETURN ( this->streamendpoint_a_, - TAO_StreamEndPoint_A, -1 ); + ACE_NEW_RETURN (this->streamendpoint_a_, + TAO_StreamEndPoint_A, -1 ); ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 ); this->flowname_ = "Data"; @@ -298,10 +298,9 @@ Client::run (void) CORBA::Boolean result = this->streamctrl_.bind (sep_a_.in(), - sep_b.in(), - the_qos.inout(), - flow_spec - ); + sep_b.in(), + the_qos.inout(), + flow_spec); timer.stop (); timer.elapsed_time (elapsed); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index d28dfb7195f..a4f3b58952c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -191,9 +191,9 @@ main (int argc, while ( !done ) { if ( orb->work_pending( ) ) - { + { orb->perform_work (); - } + } } orb->shutdown( 1 ); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp index dc4c20b35e7..3ea29febda8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp @@ -40,8 +40,8 @@ Receiver_Stats::accumulate (const Receiver_Stats &rhs) void Receiver_Stats::dump_results (const ACE_TCHAR *msg, - FILE *file, - ACE_UINT32 sf) const + FILE *file, + ACE_UINT32 sf) const { if (this->samples_count () == 0u) { @@ -74,8 +74,8 @@ Receiver_Stats::dump_results (const ACE_TCHAR *msg, ACE_OS::fprintf (file, ACE_TEXT ("Inter Frame Arrival Time Statistics in msecs : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), - l_min, this->min_at_, - l_avg, - l_max, this->max_at_, - l_dev); + l_min, this->min_at_, + l_avg, + l_max, this->max_at_, + l_dev); } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h index a06ec05dd90..4293c1a4d29 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h @@ -54,9 +54,9 @@ public: * presented in microseconds. */ void dump_results (const ACE_TCHAR *msg, - FILE *file, + FILE *file, ACE_UINT32 scale_factor) const; - + private: /// The number of samples ACE_UINT32 samples_count_; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 2bdc00c0bb7..acea9727275 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -43,8 +43,8 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, // the sender. // ACE_DEBUG ((LM_DEBUG, - "Receiver_Callback::receive_frame for frame %d\n", - this->frame_count_++)); + "Receiver_Callback::receive_frame for frame %d\n", + this->frame_count_++)); if (start) { @@ -77,8 +77,6 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, frame = frame->cont (); } - - return 0; } @@ -86,14 +84,14 @@ void Receiver_Callback::dump_samples (const char* file) { ACE_DEBUG ((LM_DEBUG, - "Dumping Stats.....\n")); + "Dumping Stats.....\n")); FILE* stats_file = ACE_OS::fopen (file, "w"); if (stats_file == 0) { ACE_ERROR ((LM_ERROR, - "Stats.dat cannot be opened \n")); + "Stats.dat cannot be opened \n")); } int i; @@ -103,8 +101,8 @@ Receiver_Callback::dump_samples (const char* file) } stats_.dump_results ("Inter Frame Arrival Time Statistics ", - stats_file, - 1); + stats_file, + 1); // ACE_High_Res_Timer::global_scale_factor ()); for (i = 0; i < stats_index; i++) @@ -115,7 +113,7 @@ Receiver_Callback::dump_samples (const char* file) ACE_OS::fclose (stats_file); ACE_DEBUG ((LM_DEBUG, - "Done\n")); + "Done\n")); } int @@ -211,9 +209,9 @@ parse_args (int argc, case 'f': output_file_name = opts.opt_arg (); break; - case 's': - stats_file_name = opts.opt_arg (); - break; + case 's': + stats_file_name = opts.opt_arg (); + break; default: ACE_ERROR_RETURN ((LM_ERROR, "Usage: receiver -f filename"), diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index a4237f7ccda..d60f5c442f3 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -125,7 +125,7 @@ int main (int argc, char* argv[]) ACE_DEBUG((LM_DEBUG, "About to call create_operation_list\n")); orb->create_operation_list(operation.in (), - opList.out()) ; + opList.out()) ; ACE_DEBUG((LM_DEBUG, "Call to create_operation_list succeeded\n")); CORBA::ULong count = opList->count() ; diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h index 90d02920675..bb2ac688cf9 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h @@ -42,8 +42,8 @@ private: /// Sets the properties for the profiles int set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm, - CORBA::Object_ptr merged_set, - CORBA::Object_ptr primary, CORBA::ULong version); + CORBA::Object_ptr merged_set, + CORBA::Object_ptr primary, CORBA::ULong version); /// Our ORB CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 461a18db17a..d7aff08ac0a 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -102,7 +102,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Instantiate the LCD_Display implementation class Simple_Server_i display_impl (orb.in (), key); PortableServer::ObjectId_var id = - PortableServer::string_to_ObjectId ("IOGR_OID"); + PortableServer::string_to_ObjectId ("IOGR_OID"); poa->activate_object_with_id (id.in(), &display_impl); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp index 8d0e458ede9..1aae450af0d 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp @@ -46,7 +46,7 @@ Simple_Server_i::shutdown (const char* key) char buf[256]; ACE_OS::sprintf (buf, "shutdown() completed by %s, still_alive=%d", - _key.in(), still_alive); + _key.in(), still_alive); ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> returning '%s'\n", _key.in(), buf)); return CORBA::string_dup (buf); } @@ -67,7 +67,7 @@ Simple_Server_i::abort (const char* key) char buf[256]; ACE_OS::sprintf (buf, "abort() completed by %s, still_alive=%d", - _key.in(), still_alive); + _key.in(), still_alive); ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> returning '%s'\n", _key.in(), buf)); return CORBA::string_dup (buf); } diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp index df927dc4b1d..501c2edc493 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp @@ -44,7 +44,7 @@ Client_Task::svc (void) hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", - the_string.in ())); + the_string.in ())); if (!this->result_) { diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp index 5c061747730..6d7f7c3e48e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp @@ -15,13 +15,13 @@ operator<< (TAO_OutputCDR& cdr, ECM_Data& x) && cdr << count ) { for (ECM_Data::Inventory::ITERATOR i = x.inventory.begin (); - i != x.inventory.end () && cdr.good_bit (); - ++i) - { - const ECM_Data::Inventory::ENTRY& v = *i; - cdr << v.ext_id_; - cdr << v.int_id_; - } + i != x.inventory.end () && cdr.good_bit (); + ++i) + { + const ECM_Data::Inventory::ENTRY& v = *i; + cdr << v.ext_id_; + cdr << v.int_id_; + } } return cdr.good_bit (); } @@ -38,16 +38,16 @@ operator>> (TAO_InputCDR& cdr, ECM_Data& x) // ACE_DEBUG ((LM_DEBUG, "Decoding <%d> elements\n", count)); for (CORBA::ULong i = 0; i < count && cdr.good_bit (); ++i) - { - CORBA::ULong ext_id; - CORBA::Double int_id; - cdr >> ext_id; - cdr >> int_id; - if (cdr.good_bit ()) - x.inventory.bind (ext_id, int_id); + { + CORBA::ULong ext_id; + CORBA::Double int_id; + cdr >> ext_id; + cdr >> int_id; + if (cdr.good_bit ()) + x.inventory.bind (ext_id, int_id); - // ACE_DEBUG ((LM_DEBUG, "Boung <%d,%f>\n", ext_id, int_id)); - } + // ACE_DEBUG ((LM_DEBUG, "Boung <%d,%f>\n", ext_id, int_id)); + } } return cdr.good_bit (); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 5fa6d56ef2b..9f3e8fbb475 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -12,7 +12,7 @@ class FTClientMain { typedef ACE_Vector StringVec; - public: +public: /////////////////////////// // construction/destruction FTClientMain (); @@ -90,7 +90,7 @@ FTClientMain::~FTClientMain () if (this->inFile_) { ACE_OS::fclose (this->inFile_); - this->inFile_ = 0; + this->inFile_ = 0; } } @@ -146,20 +146,20 @@ void FTClientMain::commandUsage(FILE* out) " q quit (end the client, not the replica(s).)\n" " q1 quit (end the client, and shutdown the currently active replica.)\n" " ? help (this message)\n", - FT_TEST::TestReplica::NOT_YET, - FT_TEST::TestReplica::RIGHT_NOW, - FT_TEST::TestReplica::WHILE_IDLE, - FT_TEST::TestReplica::BEFORE_STATE_CHANGE, - FT_TEST::TestReplica::BEFORE_REPLICATION, - FT_TEST::TestReplica::BEFORE_REPLY, - FT_TEST::TestReplica::DURING_IS_ALIVE, - FT_TEST::TestReplica::DENY_IS_ALIVE, - FT_TEST::TestReplica::DURING_GET_UPDATE, - FT_TEST::TestReplica::BEFORE_SET_UPDATE, - FT_TEST::TestReplica::AFTER_SET_UPDATE, - FT_TEST::TestReplica::DURING_GET_STATE, - FT_TEST::TestReplica::BEFORE_SET_STATE, - FT_TEST::TestReplica::AFTER_SET_STATE); + FT_TEST::TestReplica::NOT_YET, + FT_TEST::TestReplica::RIGHT_NOW, + FT_TEST::TestReplica::WHILE_IDLE, + FT_TEST::TestReplica::BEFORE_STATE_CHANGE, + FT_TEST::TestReplica::BEFORE_REPLICATION, + FT_TEST::TestReplica::BEFORE_REPLY, + FT_TEST::TestReplica::DURING_IS_ALIVE, + FT_TEST::TestReplica::DENY_IS_ALIVE, + FT_TEST::TestReplica::DURING_GET_UPDATE, + FT_TEST::TestReplica::BEFORE_SET_UPDATE, + FT_TEST::TestReplica::AFTER_SET_UPDATE, + FT_TEST::TestReplica::DURING_GET_STATE, + FT_TEST::TestReplica::BEFORE_SET_STATE, + FT_TEST::TestReplica::AFTER_SET_STATE); } int @@ -212,8 +212,8 @@ FTClientMain::parse_args (int argc, char *argv[]) void FTClientMain::usage(FILE* out)const { ACE_OS::fprintf (out, "usage" - " -c " - " [-f ]...\n"); + " -c " + " [-f ]...\n"); } int FTClientMain::pass ( @@ -235,12 +235,12 @@ int FTClientMain::pass ( { char buffer[1000]; char *str_ = ACE_OS::fgets (buffer, sizeof(buffer)-1, this->commandIn_); - if ( str_ ) - { - str_ = ACE_OS::strrchr (str_, '\n'); - if ( str_ ) - *str_ = '\0'; - } + if ( str_ ) + { + str_ = ACE_OS::strrchr (str_, '\n'); + if ( str_ ) + *str_ = '\0'; + } command = buffer; } retry = 0; diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index e95ad86d566..8aa47e4137a 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -121,14 +121,13 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[]) void FTAPP::FT_Creator::usage(FILE* out)const { ACE_OS::fprintf (out, "usage\n" - " -r \n" - " -f (if not specified, ReplicationManager is used.)\n" - " -u \n" - " -i (toggle write ior for each object (default false))\n" - " -p \n" - " -g (toggle write iogr to file (default false))\n" - " -n (toggle register iogr with name service (default true))\n") - ; + " -r \n" + " -f (if not specified, ReplicationManager is used.)\n" + " -u \n" + " -i (toggle write ior for each object (default false))\n" + " -p \n" + " -g (toggle write iogr to file (default false))\n" + " -n (toggle register iogr with name service (default true))\n"); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 376831c7539..87b2b034d41 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -129,8 +129,8 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[]) } default: - ACE_OS::fprintf (stderr, "%s: Unknown argument - %c\n", - argv[0], c); + ACE_OS::fprintf (stderr, "%s: Unknown argument - %c\n", + argv[0], c); this->usage(stderr); result = -1; break; @@ -147,8 +147,8 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[]) void TAO_FT_ReplicationManagerController::usage (FILE* out) const { ACE_OS::fprintf (out, "usage" - " -k " - " -x (shutdown the Replication Manager)\n"); + " -k " + " -x (shutdown the Replication Manager)\n"); } int TAO_FT_ReplicationManagerController::run () diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 30274758980..07c2920f87d 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -320,12 +320,12 @@ int ReplicationManagerFaultConsumerAdapter::init ( // Signal that we are ready to go. if (result == 0 && this->readyFile_ != 0) { - FILE* ready = ACE_OS::fopen (this->readyFile_, "w"); - if (ready) - { - ACE_OS::fprintf (ready, "ready\n"); - ACE_OS::fclose (ready); - } + FILE* ready = ACE_OS::fopen (this->readyFile_, "w"); + if (ready) + { + ACE_OS::fprintf (ready, "ready\n"); + ACE_OS::fclose (ready); + } } } diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index 448a3438905..cdc0cd8f04d 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -222,12 +222,12 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb) if (result == 0 && this->readyFile_ != 0) { - FILE *ready = ACE_OS::fopen (this->readyFile_, "w"); - if ( ready ) - { - ACE_OS::fprintf (ready, "ready\n"); - ACE_OS::fclose (ready); - } + FILE *ready = ACE_OS::fopen (this->readyFile_, "w"); + if ( ready ) + { + ACE_OS::fprintf (ready, "ready\n"); + ACE_OS::fclose (ready); + } } } return result; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index 7f3685ede7d..a61311735b4 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -135,7 +135,7 @@ Latency_Query_Client::run (void) stats.dump_results ("Total", gsf); ACE_Throughput_Stats::dump_throughput ("Total", - gsf, + gsf, test_end - test_start, stats.samples_count ()); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 843f72beaf4..6ef42ee3e6c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -56,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "Nil Test::Basic reference <%s>\n", ior), 1); - } + } for (int i = 0; i < 5; i++) { @@ -65,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n", the_string.in ())); - } + } basic->remove_member (); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 58d813c0349..d03bc0f5895 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -33,51 +33,51 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Basic *basic_servant6; ACE_NEW_RETURN (basic_servant1, - Basic (lb_server.object_group (), - lb_server.load_manager (), - lb_server.orb (), - location1), - 1); + Basic (lb_server.object_group (), + lb_server.load_manager (), + lb_server.orb (), + location1), + 1); PortableServer::ServantBase_var owner_transfer1(basic_servant1); ACE_NEW_RETURN (basic_servant2, - Basic (lb_server.object_group (), - lb_server.load_manager (), - lb_server.orb (), - location2), - 1); + Basic (lb_server.object_group (), + lb_server.load_manager (), + lb_server.orb (), + location2), + 1); PortableServer::ServantBase_var owner_transfer2(basic_servant2); ACE_NEW_RETURN (basic_servant3, - Basic (lb_server.object_group (), - lb_server.load_manager (), - lb_server.orb (), - location3), - 1); + Basic (lb_server.object_group (), + lb_server.load_manager (), + lb_server.orb (), + location3), + 1); PortableServer::ServantBase_var owner_transfer3(basic_servant3); ACE_NEW_RETURN (basic_servant4, - Basic (lb_server.object_group (), - lb_server.load_manager (), - lb_server.orb (), - location4), - 1); + Basic (lb_server.object_group (), + lb_server.load_manager (), + lb_server.orb (), + location4), + 1); PortableServer::ServantBase_var owner_transfer4(basic_servant4); ACE_NEW_RETURN (basic_servant5, - Basic (lb_server.object_group (), - lb_server.load_manager (), - lb_server.orb (), - location5), - 1); + Basic (lb_server.object_group (), + lb_server.load_manager (), + lb_server.orb (), + location5), + 1); PortableServer::ServantBase_var owner_transfer5(basic_servant5); ACE_NEW_RETURN (basic_servant6, - Basic (lb_server.object_group (), - lb_server.load_manager (), - lb_server.orb (), - location6), - 1); + Basic (lb_server.object_group (), + lb_server.load_manager (), + lb_server.orb (), + location6), + 1); PortableServer::ServantBase_var owner_transfer6(basic_servant6); if (lb_server.register_servant (basic_servant1, location1) == -1 diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp index 8b33a533185..6e0079fac75 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp @@ -21,8 +21,8 @@ Factory::create_object ( Simple *servant; ACE_NEW_THROW_EX (servant, - Simple, - CORBA::NO_MEMORY ()); + Simple, + CORBA::NO_MEMORY ()); PortableServer::ServantBase_var safe_servant = servant; @@ -42,8 +42,8 @@ Factory::create_object ( PortableGroup::GenericFactory::FactoryCreationId *my_fcid = 0; ACE_NEW_THROW_EX (my_fcid, - PortableGroup::GenericFactory::FactoryCreationId, - CORBA::NO_MEMORY ()); + PortableGroup::GenericFactory::FactoryCreationId, + CORBA::NO_MEMORY ()); fcid = my_fcid; @@ -71,9 +71,9 @@ Factory::delete_object ( Factory_Map::ENTRY *entry = 0; if (this->factory_map_.find (my_fcid, entry) == 0) { - if (this->factory_map_.unbind (my_fcid) != 0) - throw CORBA::INTERNAL (); - } + if (this->factory_map_.unbind (my_fcid) != 0) + throw CORBA::INTERNAL (); + } } else throw PortableGroup::ObjectNotFound (); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index d51850a5df6..9e988143541 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -28,7 +28,7 @@ LB_server::run (void) { ACE_Time_Value period (0, 10); while (1) - { + { this->orb_->perform_work (&period); } } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index 4b984f94960..0dce976d342 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -32,21 +32,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_NEW_RETURN (basic_servant1, - Basic (lb_server.get_basic_object_group (), - lb_server.load_manager (), - lb_server.orb (), + Basic (lb_server.get_basic_object_group (), + lb_server.load_manager (), + lb_server.orb (), 1, - location1), - 1); + location1), + 1); PortableServer::ServantBase_var basic_owner_transfer1(basic_servant1); ACE_NEW_RETURN (simple_servant1, - Simple (lb_server.get_simple_object_group (), - lb_server.load_manager (), - lb_server.orb (), + Simple (lb_server.get_simple_object_group (), + lb_server.load_manager (), + lb_server.orb (), 1, - location1), - 1); + location1), + 1); PortableServer::ServantBase_var simple_owner_transfer1(simple_servant1); if (lb_server.register_basic_servant (basic_servant1, location1) == -1) @@ -72,21 +72,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_NEW_RETURN (basic_servant2, - Basic (lb_server.get_basic_object_group (), - lb_server.load_manager (), - lb_server.orb (), + Basic (lb_server.get_basic_object_group (), + lb_server.load_manager (), + lb_server.orb (), 2, - location1), - 1); + location1), + 1); PortableServer::ServantBase_var basic_owner_transfer2(basic_servant2); ACE_NEW_RETURN (simple_servant2, - Simple (lb_server.get_simple_object_group (), - lb_server.load_manager (), - lb_server.orb (), + Simple (lb_server.get_simple_object_group (), + lb_server.load_manager (), + lb_server.orb (), 2, - location1), - 1); + location1), + 1); PortableServer::ServantBase_var simple_owner_transfer2(simple_servant2); if (lb_server.register_basic_servant (basic_servant2, location1) == -1) diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index fd5c6e9ce6b..33647bbbd28 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -6,9 +6,8 @@ #include "ace/OS_NS_unistd.h" ACE_RCSID (CPU, - client, - "$Id$") - + client, + "$Id$") const char * location = "MyLocation"; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp index b906b2fb1e5..f0336387ac3 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp @@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (log_test.init(argc, argv) == -1) { ACE_ERROR_RETURN((LM_ERROR, - "xx - Failed initializing BasicLog_Test.\n"),-1); + "xx - Failed initializing BasicLog_Test.\n"),-1); } // We may want to replace this with a run on the BasicLog_Test. @@ -35,7 +35,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // go easy until this works //@@ use ACE_U64_TO_U32 to convert ULongLong to ULong //in call to test_retrieval - /* if (log_test.test_retrieval(10) == -1) +/* if (log_test.test_retrieval(10) == -1) { ACE_DEBUG((LM_ERROR,"The test of retrieval failed.\n")); } @@ -68,7 +68,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DEBUG((LM_ERROR,"** - The capacity alarm threshold test succeeded.\n\n")); } - + if (log_test.test_LogAction() == -1) { ACE_DEBUG((LM_ERROR,"xx - The log action test failed.\n\n")); diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp index f9ba2a2d236..94e400077c2 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp @@ -8,9 +8,9 @@ ACE_RCSID(Muxing, Client_Task, "$Id$") Client_Task::Client_Task ( - CORBA::ORB_ptr corb, + CORBA::ORB_ptr corb, Messenger_ptr messenger, - ACE_Thread_Manager *thr_mgr) + ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) , result_ (0) , corb_ (CORBA::ORB::_duplicate (corb)) diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp index 65d0334ee0f..95f90ea6b77 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp @@ -29,20 +29,20 @@ Foo_i::baz (void) try { SecurityLevel3::ClientCredentials_var credentials = - this->current_->client_credentials (); + this->current_->client_credentials (); CORBA::String_var id = credentials->creds_id (); ACE_DEBUG ((LM_DEBUG, - "FOO (%P|%t) ClientCredentials ID: %s\n", id.in ())); + "FOO (%P|%t) ClientCredentials ID: %s\n", id.in ())); return; } catch (const CORBA::BAD_INV_ORDER &ex) { ACE_DEBUG ((LM_INFO, - "FOO (%P|%t) Caught BAD_INV_ORDER exception trying to obtain " - "client credentials. This is okay if the invocation was via " - "non-secured means.\n")); + "FOO (%P|%t) Caught BAD_INV_ORDER exception trying to obtain " + "client credentials. This is okay if the invocation was via " + "non-secured means.\n")); ex._tao_print_exception ("obtaining client credentials"); // should we re-throw? No, because what we're testing is whether // we go into this method, not whether the method itself operates -- cgit v1.2.1