diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-13 16:21:44 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-13 16:21:44 +0100 |
| commit | b8c40bf13108a670ee1e540766eae816bcec59c9 (patch) | |
| tree | 64c8e1ffee990168a2c0ef15a3dd055f867031d5 /searchlib | |
| parent | 789bb72d01278396fa9e1be37a5c05263b212502 (diff) | |
Shorten name: isAlignedEntryRefType -> isAlignedType.
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/datastore/entryref.h | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/searchlib/src/vespa/searchlib/datastore/entryref.h b/searchlib/src/vespa/searchlib/datastore/entryref.h index 242522c2bc4..918e514c8df 100644 --- a/searchlib/src/vespa/searchlib/datastore/entryref.h +++ b/searchlib/src/vespa/searchlib/datastore/entryref.h @@ -36,7 +36,7 @@ public: static uint32_t numBuffers() { return 1 << BufferBits; } static uint64_t align(uint64_t val) { return val; } static uint64_t pad(uint64_t val) { (void) val; return 0ul; } - static constexpr bool isAlignedEntryRefType = false; + static constexpr bool isAlignedType = false; }; /** @@ -57,7 +57,7 @@ public: static uint64_t offsetSize() { return ParentType::offsetSize() << OffsetAlign; } static uint64_t align(uint64_t val) { return val + pad(val); } static uint64_t pad(uint64_t val) { return (-val & PadConstant); } - static constexpr bool isAlignedEntryRefType = true; + static constexpr bool isAlignedType = true; }; } diff --git a/searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp b/searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp index 69b3cb300b9..8ec44bee71c 100644 --- a/searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp +++ b/searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp @@ -25,7 +25,7 @@ RawAllocator<EntryT, RefT>::alloc(size_t numElems, size_t extraElems) size_t oldBufferSize = state.size(); EntryT *buffer = _store.getBufferEntry<EntryT>(activeBufferId, oldBufferSize); state.pushed_back(numElems); - if (RefT::isAlignedEntryRefType) { + if (RefT::isAlignedType) { // AlignedEntryRef constructor scales down offset by alignment return HandleType(RefT(oldBufferSize, activeBufferId), buffer); } else { |