firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 21:23:03 +01:00
Code Issues

fix gcc warnings

Browse Source
This commit is contained in:
alexpeshkoff 2005-03-20 13:52:51 +00:00
parent 08b6a92bd2
commit 0e98fe0052
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/opt.cpp
View File

@ -1653,7 +1653,7 @@ static void check_sorts(RecordSelExpr* rse)
for (; sort_ptr < sort_end; sort_ptr++) { for (; sort_ptr < sort_end; sort_ptr++) {
if ((*sort_ptr)->nod_type == nod_field) { if ((*sort_ptr)->nod_type == nod_field) {
// Get stream for this field at this position. // Get stream for this field at this position.
const UCHAR current_stream = (UCHAR)(*sort_ptr)->nod_arg[e_fld_stream]; const UCHAR current_stream = (UCHAR)(IPTR)(*sort_ptr)->nod_arg[e_fld_stream];
// If this is the first position node, save this stream. // If this is the first position node, save this stream.
if (sort_ptr == sort->nod_arg) { if (sort_ptr == sort->nod_arg) {
sort_stream = current_stream; sort_stream = current_stream;
@ -1688,7 +1688,7 @@ static void check_sorts(RecordSelExpr* rse)
for (int i = 0; i < new_rse->rse_count; i++) { for (int i = 0; i < new_rse->rse_count; i++) {
jrd_nod* subNode = (jrd_nod*) new_rse->rse_relation[i]; jrd_nod* subNode = (jrd_nod*) new_rse->rse_relation[i];
if (subNode->nod_type == nod_relation && if (subNode->nod_type == nod_relation &&
((USHORT)subNode->nod_arg[e_rel_stream]) == sort_stream && ((USHORT)(IPTR)subNode->nod_arg[e_rel_stream]) == sort_stream &&
new_rse != rse) new_rse != rse)
{ {
sortStreamFound = true; sortStreamFound = true;
@ -1712,7 +1712,7 @@ static void check_sorts(RecordSelExpr* rse)
} }
else { else {
if (node->nod_type == nod_relation && if (node->nod_type == nod_relation &&
((USHORT)node->nod_arg[e_rel_stream]) == sort_stream && ((USHORT)(IPTR)node->nod_arg[e_rel_stream]) == sort_stream &&
new_rse && new_rse != rse) new_rse && new_rse != rse)
{ {
new_rse->rse_sorted = sort; new_rse->rse_sorted = sort;