Skip to content

Commit

Permalink
8328997: Remove unnecessary template parameter lists in GrowableArray
Browse files Browse the repository at this point in the history
Backport-of: 3d2283800acee58dbf046c8b401a5a144ab65ed1
  • Loading branch information
Jan Kratochvil authored and TheRealMDoerr committed May 15, 2024
1 parent 87318f8 commit fdb82f4
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/hotspot/share/utilities/growableArray.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ class GrowableArrayView : public GrowableArrayBase {
protected:
E* _data; // data array

GrowableArrayView<E>(E* data, int capacity, int initial_len) :
GrowableArrayView(E* data, int capacity, int initial_len) :
GrowableArrayBase(capacity, initial_len), _data(data) {}

~GrowableArrayView() {}

public:
const static GrowableArrayView EMPTY;

bool operator==(const GrowableArrayView<E>& rhs) const {
bool operator==(const GrowableArrayView& rhs) const {
if (_len != rhs._len)
return false;
for (int i = 0; i < _len; i++) {
Expand All @@ -137,7 +137,7 @@ class GrowableArrayView : public GrowableArrayBase {
return true;
}

bool operator!=(const GrowableArrayView<E>& rhs) const {
bool operator!=(const GrowableArrayView& rhs) const {
return !(*this == rhs);
}

Expand Down Expand Up @@ -345,7 +345,7 @@ template <typename E>
class GrowableArrayFromArray : public GrowableArrayView<E> {
public:

GrowableArrayFromArray<E>(E* data, int len) :
GrowableArrayFromArray(E* data, int len) :
GrowableArrayView<E>(data, len, len) {}
};

Expand Down Expand Up @@ -480,7 +480,7 @@ class GrowableArrayWithAllocator : public GrowableArrayView<E> {
return this->at(location);
}

void swap(GrowableArrayWithAllocator<E, Derived>* other) {
void swap(GrowableArrayWithAllocator* other) {
::swap(this->_data, other->_data);
::swap(this->_len, other->_len);
::swap(this->_capacity, other->_capacity);
Expand Down Expand Up @@ -682,8 +682,8 @@ class GrowableArrayMetadata {
// See: init_checks.

template <typename E>
class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E> > {
friend class GrowableArrayWithAllocator<E, GrowableArray<E> >;
class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E>> {
friend class GrowableArrayWithAllocator<E, GrowableArray>;
friend class GrowableArrayTest;

static E* allocate(int max) {
Expand Down Expand Up @@ -731,39 +731,39 @@ class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E> > {
GrowableArray() : GrowableArray(2 /* initial_capacity */) {}

explicit GrowableArray(int initial_capacity) :
GrowableArrayWithAllocator<E, GrowableArray<E> >(
GrowableArrayWithAllocator<E, GrowableArray>(
allocate(initial_capacity),
initial_capacity),
_metadata() {
init_checks();
}

GrowableArray(int initial_capacity, MEMFLAGS memflags) :
GrowableArrayWithAllocator<E, GrowableArray<E> >(
GrowableArrayWithAllocator<E, GrowableArray>(
allocate(initial_capacity, memflags),
initial_capacity),
_metadata(memflags) {
init_checks();
}

GrowableArray(int initial_capacity, int initial_len, const E& filler) :
GrowableArrayWithAllocator<E, GrowableArray<E> >(
GrowableArrayWithAllocator<E, GrowableArray>(
allocate(initial_capacity),
initial_capacity, initial_len, filler),
_metadata() {
init_checks();
}

GrowableArray(int initial_capacity, int initial_len, const E& filler, MEMFLAGS memflags) :
GrowableArrayWithAllocator<E, GrowableArray<E> >(
GrowableArrayWithAllocator<E, GrowableArray>(
allocate(initial_capacity, memflags),
initial_capacity, initial_len, filler),
_metadata(memflags) {
init_checks();
}

GrowableArray(Arena* arena, int initial_capacity, int initial_len, const E& filler) :
GrowableArrayWithAllocator<E, GrowableArray<E> >(
GrowableArrayWithAllocator<E, GrowableArray>(
allocate(initial_capacity, arena),
initial_capacity, initial_len, filler),
_metadata(arena) {
Expand Down Expand Up @@ -847,15 +847,15 @@ class GrowableArrayIterator : public StackObj {

public:
GrowableArrayIterator() : _array(nullptr), _position(0) { }
GrowableArrayIterator<E>& operator++() { ++_position; return *this; }
E operator*() { return _array->at(_position); }
GrowableArrayIterator& operator++() { ++_position; return *this; }
E operator*() { return _array->at(_position); }

bool operator==(const GrowableArrayIterator<E>& rhs) {
bool operator==(const GrowableArrayIterator& rhs) {
assert(_array == rhs._array, "iterator belongs to different array");
return _position == rhs._position;
}

bool operator!=(const GrowableArrayIterator<E>& rhs) {
bool operator!=(const GrowableArrayIterator& rhs) {
assert(_array == rhs._array, "iterator belongs to different array");
return _position != rhs._position;
}
Expand Down

1 comment on commit fdb82f4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.