diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:56 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:56 +0000 |
commit | bdd31e4d7374fb4f1cbb745021e90dd9f2e8e6d2 (patch) | |
tree | 24d08fa33165c20198fe9658efe3bda6fbe292ac /TAO/utils | |
parent | e8cc76aad5f556c77963836aacfe813876795059 (diff) | |
download | ATCD-bdd31e4d7374fb4f1cbb745021e90dd9f2e8e6d2.tar.gz |
Removed trailing whitespaces
Diffstat (limited to 'TAO/utils')
-rw-r--r-- | TAO/utils/NamingViewer/NamingViewer.cpp | 2 | ||||
-rw-r--r-- | TAO/utils/catior/Catior_i.cpp | 10 | ||||
-rw-r--r-- | TAO/utils/logWalker/Invocation.cpp | 4 | ||||
-rw-r--r-- | TAO/utils/logWalker/Session.cpp | 12 | ||||
-rw-r--r-- | TAO/utils/logWalker/Thread.cpp | 22 | ||||
-rw-r--r-- | TAO/utils/logWalker/logWalker.cpp | 6 | ||||
-rw-r--r-- | TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp | 14 | ||||
-rw-r--r-- | TAO/utils/wxNamingViewer/wxBindNewContext.cpp | 10 | ||||
-rw-r--r-- | TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp | 10 |
9 files changed, 45 insertions, 45 deletions
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp index b9e71b0c68f..91cde3a4952 100644 --- a/TAO/utils/NamingViewer/NamingViewer.cpp +++ b/TAO/utils/NamingViewer/NamingViewer.cpp @@ -67,7 +67,7 @@ BOOL CNamingViewerApp::InitInstance() { int argc = Argv.argc (); CORBA::ORB_var ORB = CORBA::ORB_init(argc, Argv.argv()); - + CNamingViewerDlg dlg(ORB); m_pMainWnd = &dlg; int const nResponse = dlg.DoModal(); diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index f39a9024f0f..454a2d03a37 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -578,19 +578,19 @@ Catior_i::cat_tao_tag_endpoints (TAO_InputCDR& stream) const char *host = epseq[iter].host; CORBA::UShort port = epseq[iter].port; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Endpoint #%d:\n", iter+1); buffer_ += buf; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Host: %s\n", host); buffer_ += buf; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Port: %d\n", port); buffer_ += buf; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Priority: %d\n", epseq[iter].priority); buffer_ += buf; } @@ -1242,7 +1242,7 @@ Catior_i::cat_profile_helper (TAO_InputCDR& stream, && iiop_version_minor <= 2)) { indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "detected new v%d.%d %C profile that catior cannot decode\n", iiop_version_major, iiop_version_minor, diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 8bee29de488..cad43310921 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -729,11 +729,11 @@ Invocation::dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_ha strm << " " << this->repl_octets_->thread()->alias(); #endif char rstat = this->repl_octets_->reply_status(); - switch (rstat) + switch (rstat) { case 0: break; - case 1: + case 1: strm << " User Exception"; break; case 2: diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp index 4a0b7c9992c..7765963e770 100644 --- a/TAO/utils/logWalker/Session.cpp +++ b/TAO/utils/logWalker/Session.cpp @@ -90,7 +90,7 @@ Session::find_process (long pid) Processes::ENTRY *entry; if (this->processes_.find(pid,entry) == 0) return entry->item(); - else + else return 0; } @@ -145,7 +145,7 @@ Session::stream_for ( ostream *oldstream, HostProcess *hp, const char *sub) if (this->has_dir()) { ACE_CString outname = this->base_dir_; - + if (oldstream == 0) { ACE_OS::mkdir(this->base_dir_.c_str()); @@ -170,13 +170,13 @@ Session::stream_for ( ostream *oldstream, HostProcess *hp, const char *sub) return &cout; } -void +void Session::dump () { bool single = !this->has_dir(); ostream *strm = this->stream_for(0); - - // report session metrics + + // report session metrics if (single) *strm << "Session summary report: " @@ -250,7 +250,7 @@ Session::dump () // iterate over the collection of host processes to associate peer -// processes via endpoints. +// processes via endpoints. void Session::reconcile (void) { diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp index cf15d84f9a2..eff70a7e625 100644 --- a/TAO/utils/logWalker/Thread.cpp +++ b/TAO/utils/logWalker/Thread.cpp @@ -33,7 +33,7 @@ Thread::pending_peer (void) const return this->new_connection_; } -void +void Thread::enter_wait (PeerProcess *pp) { this->pending_.push (pp); @@ -44,7 +44,7 @@ Thread::enter_wait (PeerProcess *pp) this->nested_++; } -void +void Thread::exit_wait (PeerProcess *pp, size_t linenum) { PeerProcess *old; @@ -52,7 +52,7 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum) return; while (old != pp) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "Line %d, Ending an invocation to peer %s, but most recent started" " is to peer %s\n", linenum, pp->id(), old->id())); // this->pending_.push(old); @@ -61,19 +61,19 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum) } } -long +long Thread::max_depth (void) const { return this->max_depth_; } -long +long Thread::encounters (void) const { return this->encounters_; } -long +long Thread::id (void) const { return this->id_; @@ -103,7 +103,7 @@ Thread::active_handle (long handle) this->active_handle_ = handle; } -long +long Thread::active_handle (void) const { return this->active_handle_; @@ -115,7 +115,7 @@ Thread::giop_target (void) return this->giop_target_; } -void +void Thread::set_giop_target (Invocation::GIOP_Buffer *buffer) { this->giop_target_ = buffer; @@ -130,12 +130,12 @@ Thread::add_invocation (Invocation *inv) void Thread::dump_detail (ostream &strm) { - strm << " " << this->alias_ << " tid = " << this->id_ + strm << " " << this->alias_ << " tid = " << this->id_ << "\t" << this->encounters_ << " encounters"; if (nested_ > 0) - strm <<", with " << this->nested_ << " nested upcalls, max depth " + strm <<", with " << this->nested_ << " nested upcalls, max depth " << this->max_depth_; - strm << endl; + strm << endl; } void diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp index 626dcb37354..06a9e992a7f 100644 --- a/TAO/utils/logWalker/logWalker.cpp +++ b/TAO/utils/logWalker/logWalker.cpp @@ -1,12 +1,12 @@ // $Id$ -// Utility to traverse and simplify verbose log files. +// Utility to traverse and simplify verbose log files. // // The goal is to take a collection of log files and extract details // related to connections, objects, and invocations to separate out // perhaps multiple processes, or at least threads to get a sense of // invocation lifecycle. -// +// // Ideally a collection of files could be used so that invocations // that traverse many processes could be tracked. @@ -56,7 +56,7 @@ parse_manifest (Session &session, ACE_TCHAR *filename) while (!strm.eof()) { strm.getline(buffer,500); - if (buffer[0] == '\0' || + if (buffer[0] == '\0' || buffer[0] == '#') { continue; diff --git a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp index a2fb3bb74ec..c3054807464 100644 --- a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp +++ b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp @@ -8,7 +8,7 @@ #include "wxAddNameServerDlg.h" #include "wxNamingViewer.h" - + #include "wx/sizer.h" #include "wx/textctrl.h" @@ -17,7 +17,7 @@ namespace // anonymous void create_dialog_components( wxDialog* dialog) { wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL); - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -40,7 +40,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -63,7 +63,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL); { wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" ); @@ -85,12 +85,12 @@ namespace // anonymous button_sizer, 0, wxALIGN_CENTER); - + dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } }; // anonymous - + WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent) #if defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) : wxDialog() @@ -109,7 +109,7 @@ WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent) { #if defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) LoadFromResource( parent, "addNameServer"); -#else +#else create_dialog_components( this); #endif // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) wxButton* ctrl = static_cast<wxButton*>( wxFindWindowByName( diff --git a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp index ab4b66c916a..748c51c5ec7 100644 --- a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp +++ b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp @@ -14,7 +14,7 @@ namespace // anonymous void create_dialog_components( wxDialog* dialog) { wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL); - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -37,7 +37,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -60,7 +60,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL); { wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" ); @@ -82,11 +82,11 @@ namespace // anonymous button_sizer, 0, wxALIGN_CENTER); - + dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } - + }; // anonymous WxBindNewContext::WxBindNewContext( wxWindow* parent) diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp index e5ba621186d..8657771243d 100644 --- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp @@ -27,14 +27,14 @@ namespace // anonymous wxDefaultSize, 0, 0, - wxLB_SINGLE, + wxLB_SINGLE, wxDefaultValidator, - "serversList" + "serversList" ), 1, wxEXPAND | wxALL, 5); - + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); { wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" ); @@ -65,12 +65,12 @@ namespace // anonymous 0, wxALL, 5); - + topsizer->Add( button_sizer, 0, wxALIGN_CENTER); - + dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } |