forked from SerenityOS/serenity
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
AK: Make Nonnull*PtrVector use size_t for indexes
This was weird. It turns out these class were using int indexes and sizes despite being derived from Vector which uses size_t. Make the universe right again by using size_t here as well.
- Loading branch information
1 parent
46efd2f
commit 81c6d8e
Showing
4 changed files
with
13 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* Copyright (c) 2018-2020, Andreas Kling <[email protected]> | ||
* Copyright (c) 2018-2021, Andreas Kling <[email protected]> | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
|
@@ -30,7 +30,7 @@ | |
|
||
namespace AK { | ||
|
||
template<typename PtrType, int inline_capacity = 0> | ||
template<typename PtrType, size_t inline_capacity = 0> | ||
class NonnullPtrVector : public Vector<PtrType, inline_capacity> { | ||
using T = typename PtrType::ElementType; | ||
using Base = Vector<PtrType, inline_capacity>; | ||
|
@@ -60,13 +60,13 @@ class NonnullPtrVector : public Vector<PtrType, inline_capacity> { | |
ALWAYS_INLINE constexpr ConstIterator end() const { return ConstIterator::end(*this); } | ||
ALWAYS_INLINE constexpr Iterator end() { return Iterator::end(*this); } | ||
|
||
ALWAYS_INLINE PtrType& ptr_at(int index) { return Base::at(index); } | ||
ALWAYS_INLINE const PtrType& ptr_at(int index) const { return Base::at(index); } | ||
ALWAYS_INLINE PtrType& ptr_at(size_t index) { return Base::at(index); } | ||
ALWAYS_INLINE const PtrType& ptr_at(size_t index) const { return Base::at(index); } | ||
|
||
ALWAYS_INLINE T& at(int index) { return *Base::at(index); } | ||
ALWAYS_INLINE const T& at(int index) const { return *Base::at(index); } | ||
ALWAYS_INLINE T& operator[](int index) { return at(index); } | ||
ALWAYS_INLINE const T& operator[](int index) const { return at(index); } | ||
ALWAYS_INLINE T& at(size_t index) { return *Base::at(index); } | ||
ALWAYS_INLINE const T& at(size_t index) const { return *Base::at(index); } | ||
ALWAYS_INLINE T& operator[](size_t index) { return at(index); } | ||
ALWAYS_INLINE const T& operator[](size_t index) const { return at(index); } | ||
ALWAYS_INLINE T& first() { return at(0); } | ||
ALWAYS_INLINE const T& first() const { return at(0); } | ||
ALWAYS_INLINE T& last() { return at(size() - 1); } | ||
|
@@ -76,7 +76,7 @@ class NonnullPtrVector : public Vector<PtrType, inline_capacity> { | |
// NOTE: You can't use resize() on a NonnullFooPtrVector since making the vector | ||
// bigger would require being able to default-construct NonnullFooPtrs. | ||
// Instead, use shrink(new_size). | ||
void resize(int) = delete; | ||
void resize(size_t) = delete; | ||
}; | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters