diff options
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp | 6 | ||||
| -rw-r--r-- | TAO/utils/logWalker/Invocation.cpp | 8 | ||||
| -rw-r--r-- | TAO/utils/logWalker/Invocation.h | 4 |
4 files changed, 17 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 71fb301e38a..23d72b53148 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Mar 8 20:27:36 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> + + * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + * utils/logWalker/Invocation.h: + * utils/logWalker/Invocation.cpp: + + Fix warning on size_t. + Fri Mar 8 20:06:15 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> * bin/tao_other_tests.lst: diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 9f7a8a9073e..fb03f8832f5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -389,7 +389,7 @@ namespace { unsigned int& this_repo_id, const unsigned int debug) { - const unsigned int size = extra_params.size(); + const size_t size = extra_params.size(); if ((size != 2) && (debug > 4)) { ACE_ERROR(( @@ -726,7 +726,7 @@ Shared_Backing_Store::init_repo(PortableServer::POA_ptr imr_poa) else { const ACE_Vector<ACE_TString>& filenames = listings->filenames(); - CORBA::ULong sz = filenames.size (); + size_t sz = filenames.size (); for (CORBA::ULong i = 0; i < sz; ++i) { if (this->opts_.debug() > 9) @@ -775,7 +775,7 @@ Shared_Backing_Store::persistent_load (bool only_changes) } const ACE_Vector<ACE_TString>& filenames = listings->filenames(); - CORBA::ULong sz = filenames.size (); + size_t sz = filenames.size (); if (this->opts_.debug() > 9) { ACE_DEBUG((LM_INFO, ACE_TEXT ("persistent_load %d files\n"), sz)); diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index c3caa419926..a7a67bf03d8 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -217,7 +217,7 @@ Invocation::new_line (ostream &strm, int indent, int offset, bool add_nl, bool s void Invocation::dump_detail (ostream &strm, - int indent, + size_t indent, Dump_Mode mode, bool show_handle) { @@ -295,7 +295,7 @@ Invocation::dump_detail (ostream &strm, #if defined (SHOW_THREAD_ID) strm << " " << this->repl_octets_->thread()->alias(); #endif - char rstat = this->repl_octets_->reply_status(); + size_t rstat = this->repl_octets_->reply_status(); if (rstat == 1 || rstat == 2) { strm << (rstat == 1 ? " User" : " System") << " Exception"; @@ -326,9 +326,9 @@ Invocation::dump_detail (ostream &strm, } void -Invocation::dump_special_details (ostream &strm, int indent, const char *opname) +Invocation::dump_special_details (ostream &strm, size_t indent, const char *opname) { - char rstat = 0; + size_t rstat = 0; if (this->repl_octets_ != 0 && this->repl_octets_->has_octets()) rstat = this->repl_octets_->reply_status(); int opid = 0; diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h index fded26d735f..dae1e15c823 100644 --- a/TAO/utils/logWalker/Invocation.h +++ b/TAO/utils/logWalker/Invocation.h @@ -82,8 +82,8 @@ public: long handle (void) const; void new_line (ostream &strm, int indent, int offset, bool add_nl, bool show_indent); - void dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_handle); - void dump_special_details (ostream &strm, int indent, const char *opname); + void dump_detail (ostream &strm, size_t indent, Dump_Mode mode, bool show_handle); + void dump_special_details (ostream &strm, size_t indent, const char *opname); private: GIOP_Buffer *req_octets_; |