susumu.yata
null+****@clear*****
Thu Aug 22 13:40:20 JST 2013
susumu.yata 2013-08-22 13:40:20 +0900 (Thu, 22 Aug 2013) New Revision: 5fac71c2d453cc3aa99e33b038340ce8a42ea590 https://github.com/groonga/grnxx/commit/5fac71c2d453cc3aa99e33b038340ce8a42ea590 Message: Use map::Pool instead of Pool to avoid errors with g++. Modified files: lib/grnxx/map/double_array.cpp lib/grnxx/map/double_array.hpp lib/grnxx/map/hash_table.cpp lib/grnxx/map/hash_table.hpp Modified: lib/grnxx/map/double_array.cpp (+1 -1) =================================================================== --- lib/grnxx/map/double_array.cpp 2013-08-21 14:00:41 +0900 (2b48100) +++ lib/grnxx/map/double_array.cpp 2013-08-22 13:40:20 +0900 (48da750) @@ -333,7 +333,7 @@ class DoubleArrayImpl { using NodeArray = Array<Node, 65536, 8192>; // 42-bit using SiblingArray = Array<uint8_t, 262144, 4096>; // 42-bit using BlockArray = Array<Block, 8192, 1024>; // 33-bit - using Pool = Pool<Bytes>; + using Pool = map::Pool<Bytes>; static constexpr uint64_t NODE_ARRAY_SIZE = 1ULL << 42; static constexpr uint64_t SIBLING_ARRAY_SIZE = 1ULL << 42; Modified: lib/grnxx/map/double_array.hpp (+1 -1) =================================================================== --- lib/grnxx/map/double_array.hpp 2013-08-21 14:00:41 +0900 (1bad27b) +++ lib/grnxx/map/double_array.hpp 2013-08-22 13:40:20 +0900 (3fb028e) @@ -56,7 +56,7 @@ template <> class DoubleArray<Bytes> : public Map<Bytes> { using Header = DoubleArrayHeader; using Impl = DoubleArrayImpl; - using Pool = Pool<Bytes>; + using Pool = map::Pool<Bytes>; struct QueueEntry { std::unique_ptr<Pool> pool; Modified: lib/grnxx/map/hash_table.cpp (+1 -1) =================================================================== --- lib/grnxx/map/hash_table.cpp 2013-08-21 14:00:41 +0900 (523fe9e) +++ lib/grnxx/map/hash_table.cpp 2013-08-22 13:40:20 +0900 (7d236e7) @@ -105,7 +105,7 @@ struct TableSizeError {}; template <typename T> class HashTableImpl { using Header = ImplHeader; - using Pool = Pool<T>; + using Pool = map::Pool<T>; public: using Key = typename Map<T>::Key; Modified: lib/grnxx/map/hash_table.hpp (+1 -1) =================================================================== --- lib/grnxx/map/hash_table.hpp 2013-08-21 14:00:41 +0900 (db21f75) +++ lib/grnxx/map/hash_table.hpp 2013-08-22 13:40:20 +0900 (fe51f69) @@ -44,7 +44,7 @@ struct HashTableHeader; template <typename T> class HashTable : public Map<T> { using Header = HashTableHeader; - using Pool = Pool<T>; + using Pool = map::Pool<T>; using Impl = HashTableImpl<T>; struct QueueEntry { -------------- next part -------------- HTML����������������������������...ダウンロード
