susumu.yata
null+****@clear*****
Wed Sep 10 19:08:18 JST 2014
susumu.yata 2014-09-10 19:08:18 +0900 (Wed, 10 Sep 2014) New Revision: 32afdd18727496b0f67c731a69bee19e3ebb9a9e https://github.com/groonga/grnxx/commit/32afdd18727496b0f67c731a69bee19e3ebb9a9e Message: Add an alias (UInt64) to uint64_t. Modified files: include/grnxx/array/bool.hpp include/grnxx/table.hpp include/grnxx/types.hpp lib/grnxx/column_impl.hpp lib/grnxx/table.cpp Modified: include/grnxx/array/bool.hpp (+3 -3) =================================================================== --- include/grnxx/array/bool.hpp 2014-09-10 14:49:37 +0900 (1c48866) +++ include/grnxx/array/bool.hpp 2014-09-10 19:08:18 +0900 (fab7db6) @@ -15,7 +15,7 @@ template <> class ArrayCRef<Bool> { public: using Value = Bool; - using Block = uint64_t; + using Block = UInt; ArrayCRef() = default; ArrayCRef(const ArrayCRef &) = default; @@ -81,7 +81,7 @@ template <> class ArrayRef<Bool> { public: using Value = Bool; - using Block = uint64_t; + using Block = UInt; ArrayRef() = default; ArrayRef(const ArrayRef &) = default; @@ -185,7 +185,7 @@ template <> class Array<Bool> { public: using Value = Bool; - using Block = uint64_t; + using Block = UInt; Array() : blocks_(), size_(0), capacity_(0) {} ~Array() {} Modified: include/grnxx/table.hpp (+2 -2) =================================================================== --- include/grnxx/table.hpp 2014-09-10 14:49:37 +0900 (bca8f04) +++ include/grnxx/table.hpp 2014-09-10 19:08:18 +0900 (5434de7) @@ -190,8 +190,8 @@ class Table { Column *key_column_; Int num_rows_; Int max_row_id_; - Array<uint64_t> bitmap_; - Array<Array<uint64_t>> bitmap_indexes_; + Array<UInt> bitmap_; + Array<Array<UInt>> bitmap_indexes_; // Create a new table. // Modified: include/grnxx/types.hpp (+13 -12) =================================================================== --- include/grnxx/types.hpp 2014-09-10 14:49:37 +0900 (d7bc9d9) +++ include/grnxx/types.hpp 2014-09-10 19:08:18 +0900 (03adef2) @@ -84,6 +84,7 @@ enum DataType { using Bool = bool; using Int = int64_t; +using UInt = uint64_t; using Float = double; @@ -209,22 +210,22 @@ class Vector<Bool> { public: Vector() = default; Vector(std::initializer_list<Bool> bits) : data_(0) { - uint64_t size = static_cast<uint64_t>(bits.size()); + UInt size = static_cast<UInt>(bits.size()); if (size > 58) { size = 58; } - uint64_t i = 0; + UInt i = 0; for (auto it = bits.begin(); it != bits.end(); ++it) { if (*it) { - data_ |= uint64_t(1) << i; + data_ |= UInt(1) << i; } ++i; } data_ |= size << 58; } - Vector(uint64_t bits, Int size) + Vector(UInt bits, Int size) : data_((bits & mask(size)) | - (static_cast<uint64_t>(std::min(size, Int(58))) << 58)) {} + (static_cast<UInt>(std::min(size, Int(58))) << 58)) {} Vector(const Vector &) = default; Vector &operator=(const Vector &) = default; @@ -237,16 +238,16 @@ class Vector<Bool> { // // If "i" is invalid, the result is undefined. Bool get(Int i) const { - return (data_ & (uint64_t(1) << i)) != 0; + return (data_ & (UInt(1) << i)) != 0; } // Set the "i"-th Bool value. // // If "i" is invalid, the result is undefined. void set(Int i, Bool value) { if (value) { - data_ |= uint64_t(1) << i; + data_ |= UInt(1) << i; } else { - data_ &= ~(uint64_t(1) << i); + data_ &= ~(UInt(1) << i); } } @@ -258,15 +259,15 @@ class Vector<Bool> { } // Return the set of Bool values. - uint64_t bits() const { + UInt bits() const { return data_ & mask(58); } private: - uint64_t data_; + UInt data_; - static uint64_t mask(Int size) { - return (uint64_t(1) << size) - 1; + static UInt mask(Int size) { + return (UInt(1) << size) - 1; } }; Modified: lib/grnxx/column_impl.hpp (+4 -4) =================================================================== --- lib/grnxx/column_impl.hpp 2014-09-10 14:49:37 +0900 (bd31aed) +++ lib/grnxx/column_impl.hpp 2014-09-10 19:08:18 +0900 (d6adbb1) @@ -126,7 +126,7 @@ class ColumnImpl<Text> : public Column { } protected: - Array<uint64_t> headers_; + Array<UInt> headers_; Array<char> bodies_; ColumnImpl(); @@ -176,7 +176,7 @@ class ColumnImpl<Vector<Int>> : public Column { } protected: - Array<uint64_t> headers_; + Array<UInt> headers_; Array<Int> bodies_; ColumnImpl(); @@ -226,7 +226,7 @@ class ColumnImpl<Vector<Float>> : public Column { } protected: - Array<uint64_t> headers_; + Array<UInt> headers_; Array<Float> bodies_; ColumnImpl(); @@ -276,7 +276,7 @@ class ColumnImpl<Vector<GeoPoint>> : public Column { } protected: - Array<uint64_t> headers_; + Array<UInt> headers_; Array<GeoPoint> bodies_; ColumnImpl(); Modified: lib/grnxx/table.cpp (+8 -8) =================================================================== --- lib/grnxx/table.cpp 2014-09-10 14:49:37 +0900 (16ff5ed) +++ lib/grnxx/table.cpp 2014-09-10 19:08:18 +0900 (dd55205) @@ -498,12 +498,12 @@ Table::Table() bitmap_indexes_() {} void Table::set_bit(Int i) { - bitmap_[i / 64] |= uint64_t(1) << (i % 64); - if (bitmap_[i / 64] == ~uint64_t(0)) { + bitmap_[i / 64] |= UInt(1) << (i % 64); + if (bitmap_[i / 64] == ~UInt(0)) { for (Int index_id = 0; index_id < bitmap_indexes_.size(); ++index_id) { i /= 64; - bitmap_indexes_[index_id][i / 64] |= uint64_t(1) << (i % 64); - if (bitmap_indexes_[index_id][i / 64] != ~uint64_t(0)) { + bitmap_indexes_[index_id][i / 64] |= UInt(1) << (i % 64); + if (bitmap_indexes_[index_id][i / 64] != ~UInt(0)) { break; } } @@ -511,13 +511,13 @@ void Table::set_bit(Int i) { } void Table::unset_bit(Int i) { - bool is_full = bitmap_[i / 64] == ~uint64_t(0); - bitmap_[i / 64] &= ~(uint64_t(1) << (i % 64)); + bool is_full = bitmap_[i / 64] == ~UInt(0); + bitmap_[i / 64] &= ~(UInt(1) << (i % 64)); if (is_full) { for (Int index_id = 0; index_id < bitmap_indexes_.size(); ++index_id) { i /= 64; - is_full = bitmap_indexes_[index_id][i / 64] == ~uint64_t(0); - bitmap_indexes_[index_id][i / 64] &= ~(uint64_t(1) << (i % 64)); + is_full = bitmap_indexes_[index_id][i / 64] == ~UInt(0); + bitmap_indexes_[index_id][i / 64] &= ~(UInt(1) << (i % 64)); if (!is_full) { break; } -------------- next part -------------- HTML����������������������������...다운로드
