diff options
Diffstat (limited to 'sql/sql_bitmap.h')
| -rw-r--r-- | sql/sql_bitmap.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h index 25725ff6c42..558240ce19d 100644 --- a/sql/sql_bitmap.h +++ b/sql/sql_bitmap.h @@ -19,6 +19,10 @@ also be able to use 32 or 64 bits bitmaps very efficiently */ +#ifndef SQL_BITMAP_INCLUDED +#define SQL_BITMAP_INCLUDED + +#include <my_sys.h> #include <my_bitmap.h> template <uint default_width> class Bitmap @@ -130,16 +134,7 @@ template <> class Bitmap<64> ulonglong map; public: Bitmap<64>() { } -#if defined(__NETWARE__) || defined(__MWERKS__) - /* - Metwork compiler gives error on Bitmap<64> - Changed to Bitmap, since in this case also it will proper construct - this class - */ - explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); } -#else explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); } -#endif void init() { } void init(uint prefix_to_set) { set_prefix(prefix_to_set); } uint length() const { return 64; } @@ -166,7 +161,7 @@ public: bool is_subset(const Bitmap<64>& map2) const { return !(map & ~map2.map); } bool is_overlapping(const Bitmap<64>& map2) const { return (map & map2.map)!= 0; } bool operator==(const Bitmap<64>& map2) const { return map == map2.map; } - char *print(char *buf) const { longlong2str(map,buf,16,1); return buf; } + char *print(char *buf) const { longlong2str(map,buf,16); return buf; } ulonglong to_ulonglong() const { return map; } class Iterator : public Table_map_iterator { @@ -186,3 +181,5 @@ public: } }; + +#endif /* SQL_BITMAP_INCLUDED */ |