Merge pull request #2395 from mitza-oci/warnings

Fixed warnings

Author: mitza-oci

ACE/ace/Message_Queue_T.cpp

@@ -1329,7 +1329,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::enqueue_head_i (ACE_Message_Block
   if (this->signal_dequeue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::truncate_cast<int> (this->cur_count_);
+    return static_cast<int> (this->cur_count_);
 }
 
 // Actually put the node at its proper position relative to its
@@ -1520,7 +1520,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i (ACE_Message_Block
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::truncate_cast<int> (this->cur_count_);
+    return static_cast<int> (this->cur_count_);
 }
 
 // Get the earliest (i.e., FIFO) ACE_Message_Block with the lowest
@@ -1596,7 +1596,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_prio_i (ACE_Message_Block
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::truncate_cast<int> (this->cur_count_);
+    return static_cast<int> (this->cur_count_);
 }
 
 // Actually get the last ACE_Message_Block (no locking, so must be
@@ -1645,7 +1645,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i (ACE_Message_Block
       && this->signal_enqueue_waiters () == -1)
     return -1;
   else
-    return ACE_Utils::truncate_cast<int> (this->cur_count_);
+    return static_cast<int> (this->cur_count_);
 }
 
 // Actually get the ACE_Message_Block with the lowest deadline time
@@ -1740,7 +1740,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::peek_dequeue_head (ACE_Message_Bl
     return -1;
 
   first_item = this->head_;
-  return ACE_Utils::truncate_cast<int> (static_cast<ssize_t> (this->cur_count_));
+  return static_cast<int> (this->cur_count_);
 }
 
 template <ACE_SYNCH_DECL, class TIME_POLICY> int
@@ -2441,7 +2441,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::enqueue_i (ACE_Message_Bl
     }
   else
     {
-      return ACE_Utils::truncate_cast<int> (this->cur_count_);
+      return static_cast<int> (this->cur_count_);
     }
 }
 
@@ -2641,7 +2641,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i (ACE_Messa
     }
   else
     {
-      return ACE_Utils::truncate_cast<int> (this->cur_count_);
+      return static_cast<int> (this->cur_count_);
     }
 }
 

TAO/TAO_IDL/be/be_codegen.cpp

@@ -3750,7 +3750,7 @@ TAO_CodeGen::make_rand_extension (char * const t)
 
   // Factor out the constant coefficient.
   float const coefficient =
-    static_cast<float> (MAX_VAL / (static_cast<float> (RAND_MAX) + 1.0f));
+    static_cast<float> (MAX_VAL / static_cast<float> (RAND_MAX) + 1.0f);
 
   for (unsigned int n = 0; n < NUM_CHARS; ++n)
     {

TAO/TAO_IDL/fe/idl.ll

@@ -114,6 +114,10 @@ static AST_Decl *           idl_find_node (const char *);
 
 #define IDL4_KEYWORD(TOKEN_NAME) if (idl_global->idl_version_ >= IDL_VERSION_4) return TOKEN_NAME;
 
+#ifdef __GNUC__
+#  pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
 %}
 
 /* SO we don't choke on files that use \r\n */