diff options
author | unknown <pem@mysql.comhem.se> | 2004-05-06 19:55:12 +0200 |
---|---|---|
committer | unknown <pem@mysql.comhem.se> | 2004-05-06 19:55:12 +0200 |
commit | 526569690e1d0d89d91359df1334b2ffba204a02 (patch) | |
tree | 125d3ae1ebe314b07915ef4518ed9cd47dde7444 /sql/sql_lex.h | |
parent | f088cf990735a451a87add42a2ed4c4fda18513a (diff) | |
download | mariadb-git-526569690e1d0d89d91359df1334b2ffba204a02.tar.gz |
Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
sql/handler.h:
Fixed (portability) bug. No qualified method names in the class definition.
sql/item_cmpfunc.h:
Attempt to silence cast warnings on some platforms.
sql/item_subselect.h:
Attempt to silence cast warnings on some platforms.
sql/set_var.cc:
Silence warning (missing cast).
sql/spatial.h:
Attempt to silence cast warnings on some platforms.
sql/sql_cache.cc:
Silence warning (wrong cast).
sql/sql_lex.h:
Attempt to silence cast warnings on some platforms.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 50f13a0391c..78bf3bdd5f5 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -341,12 +341,18 @@ public: bool create_total_list(THD *thd, st_lex *lex, TABLE_LIST **result); st_select_lex_unit* master_unit(); st_select_lex* outer_select(); - st_select_lex* first_select() { return (st_select_lex*) slave; } + st_select_lex* first_select() + { + return my_reinterpret_cast(st_select_lex*)(slave); + } st_select_lex* first_select_in_union() { - return (st_select_lex*) slave; + return my_reinterpret_cast(st_select_lex*)(slave); + } + st_select_lex_unit* next_unit() + { + return my_reinterpret_cast(st_select_lex_unit*)(next); } - st_select_lex_unit* next_unit() { return (st_select_lex_unit*) next; } st_select_lex* return_after_parsing() { return return_to; } void exclude_level(); void exclude_tree(); |