diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 17:14:05 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:12:12 +0000 |
| commit | d995dd2865b4dd5d01175594ed667cfe8ce41712 (patch) | |
| tree | c5072261dd3a00d47d72e4f085822a68d7ec3ee5 /sql/partition_element.h | |
| parent | 7bcf5e2907db6a8f1178aca967c8d326be3e5e22 (diff) | |
| download | mariadb-git-d995dd2865b4dd5d01175594ed667cfe8ce41712.tar.gz | |
Windows : reenable warning C4805 (unsafe mix of types in bool operations)
Diffstat (limited to 'sql/partition_element.h')
| -rw-r--r-- | sql/partition_element.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/partition_element.h b/sql/partition_element.h index fdf2cb3900d..162c446a3c2 100644 --- a/sql/partition_element.h +++ b/sql/partition_element.h @@ -185,13 +185,13 @@ public: // mixup elem_type type() { - return (elem_type)(signed_flag << 1 | max_value); + return (elem_type)(int(signed_flag) << 1 | int(max_value)); } void type(elem_type val) { - max_value= val & 1; - signed_flag= val & 2; + max_value= (bool)(val & 1); + signed_flag= (bool)(val & 2); } partition_element() |