@@ -747,7 +747,8 @@ using TransferableIntTable = ValueTable<int64_t, /*kTransferable=*/true>;
747
747
748
748
constexpr size_t kNonSooSize = sizeof (HeapOrSoo) + 8 ;
749
749
static_assert (sizeof (SizedValue<kNonSooSize >) >= kNonSooSize , " too small" );
750
- using NonSooIntTable = ValueTable<SizedValue<kNonSooSize >>;
750
+ using NonSooIntTableSlotType = SizedValue<kNonSooSize >;
751
+ using NonSooIntTable = ValueTable<NonSooIntTableSlotType>;
751
752
using SooIntTable = ValueTable<int64_t , /* kTransferable=*/ true , /* kSoo=*/ true >;
752
753
753
754
template <typename T>
@@ -3574,7 +3575,7 @@ TEST(Table, CountedHash) {
3574
3575
// IterateOverFullSlots doesn't support SOO.
3575
3576
TEST (Table, IterateOverFullSlotsEmpty) {
3576
3577
NonSooIntTable t;
3577
- using SlotType = typename NonSooIntTable::slot_type ;
3578
+ using SlotType = NonSooIntTableSlotType ;
3578
3579
auto fail_if_any = [](const ctrl_t *, void * i) {
3579
3580
FAIL () << " expected no slots " << **static_cast <SlotType*>(i);
3580
3581
};
@@ -3589,7 +3590,7 @@ TEST(Table, IterateOverFullSlotsEmpty) {
3589
3590
3590
3591
TEST (Table, IterateOverFullSlotsFull) {
3591
3592
NonSooIntTable t;
3592
- using SlotType = typename NonSooIntTable::slot_type ;
3593
+ using SlotType = NonSooIntTableSlotType ;
3593
3594
3594
3595
std::vector<int64_t > expected_slots;
3595
3596
for (int64_t idx = 0 ; idx < 128 ; ++idx) {
@@ -3619,7 +3620,7 @@ TEST(Table, IterateOverFullSlotsDeathOnRemoval) {
3619
3620
if (reserve_size == -1 ) reserve_size = size;
3620
3621
for (int64_t idx = 0 ; idx < size; ++idx) {
3621
3622
NonSooIntTable t;
3622
- using SlotType = typename NonSooIntTable::slot_type ;
3623
+ using SlotType = NonSooIntTableSlotType ;
3623
3624
t.reserve (static_cast <size_t >(reserve_size));
3624
3625
for (int val = 0 ; val <= idx; ++val) {
3625
3626
t.insert (val);
@@ -3654,7 +3655,7 @@ TEST(Table, IterateOverFullSlotsDeathOnInsert) {
3654
3655
int64_t size = reserve_size / size_divisor;
3655
3656
for (int64_t idx = 1 ; idx <= size; ++idx) {
3656
3657
NonSooIntTable t;
3657
- using SlotType = typename NonSooIntTable::slot_type ;
3658
+ using SlotType = NonSooIntTableSlotType ;
3658
3659
t.reserve (static_cast <size_t >(reserve_size));
3659
3660
for (int val = 1 ; val <= idx; ++val) {
3660
3661
t.insert (val);
0 commit comments