diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 14:00:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 14:00:16 +0200 |
| commit | 4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500 (patch) | |
| tree | fbc0352dd0f6bf00d934e96e6b3af99a1cfe0b2c /sql/sql_bitmap.h | |
| parent | ef5241ae05b0f1bdf3668b4f0876bf0b4fe309a0 (diff) | |
| download | mariadb-git-4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500.tar.gz | |
remove ULL() and LL(), because they're totally unnecessary
and sometimes harmful (used with expressions)
Diffstat (limited to 'sql/sql_bitmap.h')
| -rw-r--r-- | sql/sql_bitmap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h index db4c7110ac7..5e86a889053 100644 --- a/sql/sql_bitmap.h +++ b/sql/sql_bitmap.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2003, 2010, Oracle and/or its affiliates + Copyright (c) 2009, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,7 +61,7 @@ public: intersect(map2buff); if (map.n_bits > sizeof(ulonglong) * 8) bitmap_set_above(&map, sizeof(ulonglong), - test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1)))); + test(map2buff & (1LL << (sizeof(ulonglong) * 8 - 1)))); } void subtract(Bitmap& map2) { bitmap_subtract(&map, &map2.map); } void merge(Bitmap& map2) { bitmap_union(&map, &map2.map); } |