Merge pull request #2396 from mitza-oci/a6t2-warnings

[ACE 6 - TAO 2] Fixed warnings

Author: mitza-oci

ACE/ace/Message_Queue_T.cpp

@@ -17,7 +17,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Notification_Strategy.h"
-#include "ace/Truncate.h"
 #include "ace/Condition_Attributes.h"
 
 #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1)
@@ -1324,7 +1323,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
@@ -1515,7 +1514,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
@@ -1591,7 +1590,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
@@ -1640,7 +1639,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
@@ -1735,7 +1734,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
@@ -2436,7 +2435,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_);
     }
 }
 
@@ -2636,7 +2635,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

@@ -3772,7 +3772,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

@@ -112,6 +112,10 @@ static AST_Decl *           idl_find_node (const char *);
 #undef ECHO
 #endif
 
+#ifdef __GNUC__
+#  pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
 %}
 
 /* SO we don't choke on files that use \r\n */