Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ACE/ace/Message_Queue_T.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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_);
}
}

Expand Down Expand Up @@ -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_);
}
}

Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/be/be_codegen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 4 additions & 0 deletions TAO/TAO_IDL/fe/idl.ll
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading