Skip to content

Commit 24df457

Browse files
authored
Fixes #2486. Pointer.elementAt replaced by + operator (#2488)
Fixes #2486. `Pointer.elementAt` replaced by `+` operator. Update pubspec.yaml as well.
1 parent 2b5ca89 commit 24df457

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+73
-433
lines changed

LibTest/ffi/Bool/Bool_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import "../../../Utils/expect.dart";
1717
void main() {
1818
Pointer<Bool> p1 = calloc<Bool>(2);
1919
try {
20-
Expect.equals(1, p1.elementAt(1).address - p1.address);
20+
Expect.equals(1, (p1 + 1).address - p1.address);
2121
Expect.equals(1, sizeOf<Bool>());
2222
} finally {
2323
calloc.free(p1);

LibTest/ffi/Char/Char_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import "../../../Utils/expect.dart";
2323
void main() {
2424
Pointer<Char> p1 = calloc<Char>(2);
2525
try {
26-
Expect.equals(1, p1.elementAt(1).address - p1.address);
26+
Expect.equals(1, (p1 + 1).address - p1.address);
2727
Expect.equals(1, sizeOf<Char>());
2828
} finally {
2929
calloc.free(p1);

LibTest/ffi/Int/Int_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import "../../../Utils/expect.dart";
2121
void main() {
2222
Pointer<Int> p1 = calloc<Int>(2);
2323
try {
24-
Expect.equals(4, p1.elementAt(1).address - p1.address);
24+
Expect.equals(4, (p1 + 1).address - p1.address);
2525
Expect.equals(4, sizeOf<Int>());
2626
} finally {
2727
calloc.free(p1);

LibTest/ffi/Int16/Int16_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "../../../Utils/expect.dart";
1515
void main() {
1616
Pointer<Int16> p1 = calloc<Int16>(2);
1717
try {
18-
Expect.equals(2, p1.elementAt(1).address - p1.address);
18+
Expect.equals(2, (p1 + 1).address - p1.address);
1919
Expect.equals(2, sizeOf<Int16>());
2020
} finally {
2121
calloc.free(p1);

LibTest/ffi/Int32/Int32_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "../../../Utils/expect.dart";
1515
void main() {
1616
Pointer<Int32> p1 = calloc<Int32>(2);
1717
try {
18-
Expect.equals(4, p1.elementAt(1).address - p1.address);
18+
Expect.equals(4, (p1 + 1).address - p1.address);
1919
Expect.equals(4, sizeOf<Int32>());
2020
} finally {
2121
calloc.free(p1);

LibTest/ffi/Int64/Int64_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "../../../Utils/expect.dart";
1515
void main() {
1616
Pointer<Int64> p1 = calloc<Int64>(2);
1717
try {
18-
Expect.equals(8, p1.elementAt(1).address - p1.address);
18+
Expect.equals(8, (p1 + 1).address - p1.address);
1919
Expect.equals(8, sizeOf<Int64>());
2020
} finally {
2121
calloc.free(p1);

LibTest/ffi/Int8/Int8_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "../../../Utils/expect.dart";
1515
void main() {
1616
Pointer<Int8> p1 = calloc<Int8>(2);
1717
try {
18-
Expect.equals(1, p1.elementAt(1).address - p1.address);
18+
Expect.equals(1, (p1 + 1).address - p1.address);
1919
Expect.equals(1, sizeOf<Int8>());
2020
} finally {
2121
calloc.free(p1);

LibTest/ffi/IntPtr/IntPtr_A01_t03.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ void main() {
1515
Pointer<IntPtr> p1 = calloc<IntPtr>(3);
1616
try {
1717
if (sizeOf<IntPtr>() == 4) {
18-
Expect.equals(4, p1.elementAt(1).address - p1.address);
19-
Expect.equals(4, p1.elementAt(2).address - p1.elementAt(1).address);
18+
Expect.equals(4, (p1 + 1).address - p1.address);
19+
Expect.equals(4, (p1 + 2).address - (p1 + 1).address);
2020
} else {
21-
Expect.equals(8, p1.elementAt(1).address - p1.address);
21+
Expect.equals(8, (p1 + 1).address - p1.address);
2222
Expect.equals(8, sizeOf<IntPtr>());
2323
}
2424
} finally {

LibTest/ffi/Long/Long_A02_t01.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import "../../../Utils/expect.dart";
2222
void main() {
2323
Pointer<Long> p1 = calloc<Long>(2);
2424
try {
25-
Expect.isTrue(p1.elementAt(1).address - p1.address == 4 ||
26-
p1.elementAt(1).address - p1.address == 8);
25+
Expect.isTrue((p1 + 1).address - p1.address == 4 ||
26+
(p1 + 1).address - p1.address == 8);
2727
Expect.isTrue(sizeOf<Long>() == 4 || sizeOf<Long>() == 8);
2828
} finally {
2929
calloc.free(p1);

LibTest/ffi/LongLong/LongLong_A02_t01.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import "../../../Utils/expect.dart";
2222
void main() {
2323
Pointer<LongLong> p1 = calloc<LongLong>(2);
2424
try {
25-
Expect.equals(8, p1.elementAt(1).address - p1.address);
25+
Expect.equals(8, (p1 + 1).address - p1.address);
2626
Expect.equals(8, sizeOf<LongLong>());
2727
} finally {
2828
calloc.free(p1);

LibTest/ffi/Pointer/elementAt_A01_t01.dart

Lines changed: 0 additions & 26 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A01_t02.dart

Lines changed: 0 additions & 26 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A01_t03.dart

Lines changed: 0 additions & 26 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A01_t04.dart

Lines changed: 0 additions & 32 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A02_t01.dart

Lines changed: 0 additions & 29 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A02_t02.dart

Lines changed: 0 additions & 30 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A02_t03.dart

Lines changed: 0 additions & 30 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A02_t04.dart

Lines changed: 0 additions & 29 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A02_t05.dart

Lines changed: 0 additions & 29 deletions
This file was deleted.

LibTest/ffi/Pointer/elementAt_A02_t06.dart

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)