Fixed conversion warnings and warnings for unused exception variables.

6 files changed, 53 insertions, 22 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 828aead2aa3..0499bb5e9dd 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,11 +1,24 @@
+Tue Jan 22 15:12:59 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * utils/logWalker/GIOP_Buffer.h:
+        * utils/logWalker/GIOP_Buffer.cpp:
+        * utils/logWalker/Invocation.cpp:
+        * utils/logWalker/Thread.cpp:
+
+          Fixed type conversion issues - size_t to long & int.
+
+        * utils/nsgroup/nsgroup.cpp:
+
+          Fixed warning for unused exception variable.
+
 Tue Jan 22 04:05:51 UTC 2013  "Kevin Stanley"  <stanleyk@ociweb.com>
 
         * bin/tao_other_tests.lst:
-         
+
           Excluded tests for FT_Naming from Win32.
 
         * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
-        
+
           Added missing initialization for naming_manager_ior_file_name_.
 
 Mon Jan 21 22:52:17 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp
index c9814c8dbaa..48f5df26530 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.cpp
+++ b/TAO/utils/logWalker/GIOP_Buffer.cpp
@@ -305,7 +305,7 @@ GIOP_Buffer::minor_version (void) const
   return this->ver_minor_;
 }
 
-char
+size_t
 GIOP_Buffer::reply_status (void) const
 {
   return this->reply_status_;
diff --git a/TAO/utils/logWalker/GIOP_Buffer.h b/TAO/utils/logWalker/GIOP_Buffer.h
index fba751b1664..1e1386374c5 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.h
+++ b/TAO/utils/logWalker/GIOP_Buffer.h
@@ -54,7 +54,7 @@ public:
   char expected_type (void) const;
   bool sending (void) const;
   char minor_version (void) const;
-  char reply_status (void) const;
+  size_t reply_status (void) const;
   size_t num_contexts (void) const;
   bool is_oneway (void);
   bool is_full (void) const;
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index 9feb497e1b6..27ed20d7da8 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -193,7 +193,10 @@ Invocation::req_line (void)
 }
 
 void
-Invocation::dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_handle)
+Invocation::dump_detail (ostream &strm,
+                         int indent,
+                         Dump_Mode mode,
+                         bool show_handle)
 {
   const char *opname = "";
   const char *dir_1 = "sent to ";
@@ -229,14 +232,15 @@ Invocation::dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_ha
   strm << " [" << opname << "]\t";
   time_t req_time = 0;
   time_t rep_time = 0;
-  long delta = 0;
+  size_t delta = 0;
   if (!this->is_oneway() && this->req_octets_ != 0)
     {
       req_time = this->req_octets_->time();
       if (this->repl_octets_ != 0)
         {
           rep_time = this->repl_octets_->time();
-          delta = this->repl_octets_->log_posn() - this->req_octets_->log_posn();
+          delta = this->repl_octets_->log_posn() -
+            this->req_octets_->log_posn();
         }
     }
   if (req_time != 0 && rep_time != 0)
@@ -262,7 +266,8 @@ Invocation::dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_ha
         {
           strm << " Reply, ";
           if (this->repl_octets_->num_contexts() > 0)
-            strm << "with " << this->repl_octets_->num_contexts() << " contexts, ";
+            strm << "with " << this->repl_octets_->num_contexts()
+                 << " contexts, ";
           strm << "size " << this->repl_octets_->expected_size() << " ";
           strm << "line " << this->repl_octets_->log_posn();
 #if defined (SHOW_THREAD_ID)
@@ -308,10 +313,13 @@ Invocation::dump_special_details (ostream &strm, const char *opname)
     {
       opid = 1;
       ACE_InputCDR &giop_cdr = this->req_octets_->payload();
-      ACE_InputCDR cdr (giop_cdr.rd_ptr(),giop_cdr.length(),giop_cdr.byte_order());
+      ACE_InputCDR cdr (giop_cdr.rd_ptr(),
+                        giop_cdr.length(),
+                        giop_cdr.byte_order());
       ACE_CDR::ULong len;
       if (cdr >> len)
-        strm << "\n        expected type ( len = " << len << ") " << cdr.rd_ptr();
+        strm << "\n        expected type ( len = " << len << ") "
+             << cdr.rd_ptr();
     }
   else if (ACE_OS::strcmp (opname, "_get_MyID") == 0)
     {
@@ -321,7 +329,9 @@ Invocation::dump_special_details (ostream &strm, const char *opname)
     {
       opid = 3;
       ACE_InputCDR &giop_cdr = this->req_octets_->payload();
-      ACE_InputCDR cdr (giop_cdr.rd_ptr(),giop_cdr.length(),giop_cdr.byte_order());
+      ACE_InputCDR cdr (giop_cdr.rd_ptr(),
+                        giop_cdr.length(),
+                        giop_cdr.byte_order());
       ACE_CDR::ULong len;
       if (cdr >> len)
         strm << "\n        name len = " << len << ") " << cdr.rd_ptr();
@@ -334,7 +344,9 @@ Invocation::dump_special_details (ostream &strm, const char *opname)
     {
       opid = 3;
       ACE_InputCDR &giop_cdr = this->req_octets_->payload();
-      ACE_InputCDR cdr (giop_cdr.rd_ptr(),giop_cdr.length(),giop_cdr.byte_order());
+      ACE_InputCDR cdr (giop_cdr.rd_ptr(),
+                        giop_cdr.length(),
+                        giop_cdr.byte_order());
       ACE_CDR::ULong count;
       if (cdr >> count)
         {
@@ -369,7 +381,9 @@ Invocation::dump_special_details (ostream &strm, const char *opname)
 
 
   ACE_InputCDR &giop_cdr = this->repl_octets_->payload();
-  ACE_InputCDR cdr (giop_cdr.rd_ptr(), giop_cdr.length(), giop_cdr.byte_order());
+  ACE_InputCDR cdr (giop_cdr.rd_ptr(),
+                    giop_cdr.length(),
+                    giop_cdr.byte_order());
 
   if (rstat == 0)
     {
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index c282a8523e5..a9e2f2394cb 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -88,7 +88,7 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum)
 long
 Thread::max_depth (void) const
 {
-  return this->max_depth_;
+  return static_cast<long> (this->max_depth_);
 }
 
 long
@@ -226,7 +226,10 @@ Thread::dump_detail (ostream &strm) const
 }
 
 void
-Thread::get_summary (long &sent_reqs, long &recv_reqs, size_t &sent_size, size_t &recv_size)
+Thread::get_summary (long &sent_reqs,
+                     long &recv_reqs,
+                     size_t &sent_size,
+                     size_t &recv_size)
 {
   for (ACE_DLList_Iterator <Invocation> i(this->invocations_);
        !i.done();
@@ -250,20 +253,21 @@ Thread::get_summary (long &sent_reqs, long &recv_reqs, size_t &sent_size, size_t
 void
 Thread::dump_invocations (ostream &strm)
 {
-  unsigned long total_request_bytes = 0;
-  strm << "   " << this->alias_ << " handled " << this->invocations_.size() << " invocations" << endl;
+  size_t total_request_bytes = 0;
+  strm << "   " << this->alias_ << " handled " << this->invocations_.size()
+       << " invocations" << endl;
 
   std::stack<Invocation *> nested;
-  for (ACE_DLList_Iterator <Invocation> i(this->invocations_);
+  for (ACE_DLList_Iterator <Invocation> i (this->invocations_);
        !i.done();
        i.advance())
     {
       Invocation *inv;
       i.next(inv);
-      int level = 0;
-      while (!nested.empty())
+      size_t level = 0;
+      while (!nested.empty ())
         {
-          if (nested.top()->contains(inv->req_line()))
+          if (nested.top()->contains (inv->req_line ()))
             {
               level = nested.size();
               break;
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index d2a905c8048..da59a31f561 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -507,7 +507,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       }
 
     }
-  catch (const CORBA::Exception& ex)
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Unable to run %C\n"),